[automerger skipped] Skip ab/6749736 in stage. am: 99f9472c3f -s ours

am skip reason: Change-Id I5ddd6573d86a554f9f0eee041490e748affd2b4d with SHA-1 23f525ff9d is in history

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

Change-Id: I3aec258badd28228cec3ad7eb64dcdceb4bd6f44