[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a0c41b15 am: 8690c7f6 -s ours

am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e30 is already in history

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

Change-Id: Ic0536ec8b87ea4b692c0a5a9a4ea8105bc0745b4