[automerger skipped] Merge Android 12 am: 935108e295 -s ours

am skip reason: Merged-In Ibd657c8fc8a3169a4e83e192a157f2e9e5e1240a with SHA-1 086b743aa1 is already in history

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

Change-Id: Ie576c97a153d1766407492a52e502bbe385dfcf3