[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 skip reason: Merged-In I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46 with SHA-1 943fd2fa is already in history

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

Change-Id: I2b7b32bf11b4cd37efe517798645731eecf035e7