Merge changes from topic "revert-2866127-HwNoService-EIABNUAXKH" into main am: a0c16dc1b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2870060

Change-Id: I2fe5182ffdb066bf6f7928d11bdc827234cb0f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>