[automerger skipped] Merge SP1A.211105.004 to aosp-master - DO NOT MERGE am: c947b5e122 -s ours am: a21be369e4 -s ours am: 81df952f94 -s ours

am skip reason: Merged-In Ie576c97a153d1766407492a52e502bbe385dfcf3 with SHA-1 7352b1c8a0 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/1877832

Change-Id: I4b200302c15898f6737698ff4b6182a2c34a59da