[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 7a2e4a99 am: d51c9221 -s ours am: 6da0b955 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I30e8f9d4a9a3cf6bdc926560cbe44e3b65821cb7