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

am skip reason: Change-Id I5081765a1f7067786819df994029cd37a56ec570 with SHA-1 241bea678f is in history

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

Change-Id: I7c30a598562fcdce228fa715621e79a4981718f6