Merge changes from topic...

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

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



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