[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: a4ce3dc7b5 -s ours

am skip reason: Merged-In I911a64b80804f1f34415ee1fad44dc27d5d84e00 with SHA-1 841be7a5ff is already in history

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

Change-Id: I31c6f6c15fc2c6ecf390aa90ad3c971883d6bd7e