[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE...

[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: c87428a9 -s ours am: 571d422c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6cb401573c80eab6c28b250a28aedee12a8667c6