[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 927e419715 -s ours am: 7a4f9dbe25 -s ours am: c3342e5b94 -s ours

am skip reason: Change-Id Ida7c2f2d77afc1c737b2e3c5c7aed2d90b0bd033 with SHA-1 9dd9b0fe2a is in history

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

Change-Id: Ie041ac9046ece58f0b743bbafdb78b68fbb48101