[automerger skipped] Merge "Merge QQ3A.200805.001" am: 6ad6d563 am:...

[automerger skipped] Merge "Merge QQ3A.200805.001" am: 6ad6d563 am: 2d4a1e47 -s ours am: b10200c5 -s ours am: e9392ea0 -s ours am: 55991837 -s ours

am skip reason: Change-Id I5f0b271fb5302e8c72024b49fb1a2ae5120821e0 with SHA-1 d4b7f4de is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1388670

Change-Id: Ifef37ab2c45e6cae1dc310c7ac0506c24b74d42b