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

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

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