[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: a427e74d43 -s ours am: cfcf0986bc -s ours am: 5bf6388076 -s ours am: 9ee1e2f032 -s ours

am skip reason: Change-Id I5005b312a0c93ff5838c8c4f8ba3e314f34c5b50 with SHA-1 062eca961f is in history

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

Change-Id: I4cd8b6ded793e76144c0d089005a30a09edb3680