[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 372dcf5177 -s ours am: 355a13f473 -s ours am: 39ff6e8c6b -s ours

am skip reason: Change-Id I131d903c43aaaf1ba934933ac89aba5e09a34269 with SHA-1 219106c371 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhidl/+/12470362

Change-Id: Ic72dd91ac611912a5df9e20c1b05137d5df3e70b