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

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

am skip reason: subject contains skip directive

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

Change-Id: I632f218d2da3da8f437aa6346f0790e63a128ab6