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

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 6e30a3fc -s ours am: 90325f7f -s ours am: 6ba28f6a -s ours am: 75fc5386 -s ours am: 0b1fbc47 -s ours

am skip reason: Change-Id I216989b052070e9f84bf1fa0f9ecc4724db50418 with SHA-1 0208ce53 is in history

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

Change-Id: I4e644a2d161d357c06892db2c3602d9430cea886