[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: 6378da64b2 -s ours am: b9f7ac3a64 -s ours

am skip reason: Merged-In I92c1e11f281e2865244b95fee92af887e5e9a9b4 with SHA-1 063ad91808 is already in history

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

Change-Id: I72e598584613b3d381a4e1f346b7be75fb2795eb