[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e129db1a...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e129db1a -s ours am: 75a66030 -s ours am: 6fb94dc6 -s ours am: 0bec8016 -s ours am: b3b3f455 -s ours

am skip reason: Change-Id I967cf8d0f42ec2b9745ce7bd95c7762e032c90d0 with SHA-1 87437306 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1323618

Change-Id: Ia6a0b551603f68b6fca73fad788b81cdfed22768