[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE...

[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: 831f1953 -s ours am: 3710ed0d -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6476193b1983bc7ad573d83b4574a5e06186402