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

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

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