[automerger skipped] Merge QQ3A.200605.002 into master am: 28b75b2347 -s ours am: aef1d6a160 -s ours

am skip reason: Change-Id Ibe29e933edd0b6b53bac4415db6f9419d874b045 with SHA-1 1bb92c2505 is in history

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

Change-Id: I173cc785ed03cf0cc9a28bfc58996f381239837b