[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 2f4c1cab -s ours am: 5281dda7 -s ours

am skip reason: skip tag Change-Id I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1 with SHA-1 48216a81 is already in history

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

Change-Id: I7c62976767abc8e386e70a2f5a286fef7359e036