[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 62a73dbe am: 1a189eb4 -s ours am: e7a2e0f4 -s ours am: 64b549d8 -s ours am: ab451c59 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie97c0ce5b248d3a35efd482d32229c68dc578e36