This reverts commit 3e65131ba3.
Reason for revert: breaking CTS 15 R2 -- the change was automerged into android15-tests-dev by accident as it is not actually part of Android 15
Bug: 386722911
Test: presubmit
Change-Id: I97d84084e84c777e8f4e65409e7711206976d63e
Merged-In: I0cdee597d393e53feb9fe9aff4d6c67330c88599