Merge changes from topic...

Merge changes from topic "revert-2870060-revert-2866127-HwNoService-EIABNUAXKH-SMYTAJDJZM" into main am: 3d64cfe6 am: 8ddfeb06

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



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