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

am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a is in history

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

Change-Id: Ie456f76702a06d46e628202a79b4c70dc19c75ae