[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 36dcf1a4 -s ours am: d5794fae -s ours am: 362a5f29 -s ours am: c80dc35f -s ours

am skip reason: Change-Id I6502829205ede2de914b27e6c2c5c42916af2b39 with SHA-1 b659a47f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12484251

Change-Id: I71ed4d0d523919883279c8bdfccf693b37834646