[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 3b528144 -s ours am: e58613df -s ours

am skip reason: Merged-In I4ab3c7053d6b3e669a928307fb17418d2b96749c with SHA-1 6b27401c is already in history

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

Change-Id: I48cce12ebadfbac942b8467992e6804c1bad003d