[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 43295278bf -s ours

am skip reason: Change-Id I4d84769d659aa740dcd55a5262564eaccddd93fb with SHA-1 9ad6885817 is in history

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

Change-Id: I431534b5009ce1bfa5377f7deca16317f34f7da7