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

am skip reason: subject contains skip directive

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

Change-Id: Id3b00bd30ed5767595aa5bf16cf4cbdca8bc1457