[automerger skipped] Merge "Merge RQ2A.210305.007" am: 2b1c8909 -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 2b1c8909 -s ours am: 5dfe6c0f -s ours am: 65d68287 -s ours am: b22190f6 -s ours

am skip reason: Change-Id Ifc7f272e273f54df843650e7e74fcad40a76994a with SHA-1 7e3f5430 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf19523dadf6f22b5306c5567321a6d101a653e6