[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: 062365942b -s ours am: 7fe0ed1b66 -s ours

am skip reason: Merged-In I6fc38d4dae7e8ed1eab1510eb6775c42344d0ce5 with SHA-1 1b1e65d670 is already in history

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

Change-Id: I48fb37b9fb8af94825f6e7c3ea05b9620c8e1a7e