[automerger skipped] Merge Android 12 am: e681c66b42 -s ours

am skip reason: Merged-In Id5f58e8cb24bcba19ec2253a9ca5d0703a54b43b with SHA-1 8c87763c0a is already in history

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

Change-Id: I31a2e1657a6a26cae90dbb0a099c133ff815d0f0