[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 2bbb6c9e -s ours am: 505f0db2 -s ours

am skip reason: Change-Id I7b50510b61129704f71ab4d9c474d74f4739aef0 with SHA-1 863a120b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia15af43e0b4d30fc28d067ba1e7e6efb332c1889