tree 7664caf564aa324a52b94d5de25335f279188b1e
parent b9f7ac3a64bf3cb2342da1210b2069cccc3236ee
parent a21be369e4186461f1a6d26861981693940184bd
author Bill Yi <byi@google.com> 1635963944 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635963944 +0000

[automerger skipped] Merge SP1A.211105.004 to aosp-master - DO NOT MERGE am: c947b5e122 -s ours am: a21be369e4 -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: I526889c7f552cc586240fd54e2497ab0a7cf4479