[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: fcdbafa7 -s ours am: f4469215 -s ours am: 78f0b376 -s ours am: d16a5425 -s ours am: 029d18d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I49e7b67c7fdd2f1aff16d4d84875c30134df4cd3