[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: fc859302e5 -s ours am: aafb1b2b62 -s ours

am skip reason: Merged-In I658c23a9ae4f94739126ddc4d2d65324a231be4d with SHA-1 0d50f83466 is already in history

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

Change-Id: I69dcc3642c895816cb9f7a141c8c2356b096bd67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>