[automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67a am:...

[automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67a am: d29d4ea3 -s ours am: 6315b5df -s ours

am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabc is already in history

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

Change-Id: Icbf2535fc30f9b624619bad85105a2ff4b370e57