[automerger skipped] Merge "Merge SP1A.211205.008" am: 3aec887b am:...

[automerger skipped] Merge "Merge SP1A.211205.008" am: 3aec887b am: bda6a288 -s ours am: 95997b06 -s ours am: 29059259 -s ours

am skip reason: skipped by user delphij

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

Change-Id: I773c6490028509d9c7ed374fd58ab8850301535c