Merge changes from topic "HwNoService" into main am: c6832095d2

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

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