Merge "Fix getting CONTEXTHUB_SERVICE throws ServiceNotFoundException" into main am: a61f05050a am: 95f9f9997c

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

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