Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: aa1aea46bb -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: I937176596b0d32fb02158ebda43ea516f43e2495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>