[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8c87763c0a -s ours am: 8538443029 -s ours

am skip reason: Merged-In Iacd606ac8d4b0a8326c5d80c8d22b629401fcf02 with SHA-1 f2e35ac83b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/contexthub/+/15571783

Change-Id: Ica545c552ca6d0bc0540a4d2eb6847e525b21791