[automerger skipped] Merge Android 12 am: e681c66b42 -s ours am: 95b1801fa2 -s ours am: 2e37a4dbda -s ours am: b34923fb47 -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: I28e1ee90edc68790017712d41ffbcd74ac67ae47