[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 412223d76f -s ours am: 1df1581b1a -s ours am: b7fb1e8cba -s ours

am skip reason: Change-Id I32fccdb114ef7fa2fc30ba7a19f8a4d711ba90ac with SHA-1 237ce3d4f8 is in history

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

Change-Id: I9c9214be03c8d61d6a337c21d739f45a366ef5df