[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 70392694 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie40b131dde917f11289f347d4eaaefd715418403