[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: 827998ad -s ours

am skip reason: Merged-In I0e49d49a8bddfbe8eceaa6ec46a08fee2ca4f105 with SHA-1 67074097 is already in history

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

Change-Id: I7a35fc8091fa9d169dee7c38d448a871afb3534b