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

am skip reason: subject contains skip directive

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

Change-Id: If079548800f9c4446099b5c93b915960920264d9