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

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

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