[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: b95ff97774 -s ours

am skip reason: Change-Id Ib1d0f8080bc35a9af330dc768b78f3385b50a47c with SHA-1 4d63656b95 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabe285af0117a992c5a680a2be43be0c1c244ca1