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

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

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