[automerger skipped] Skip ab/6749736 in stage. am: 99f9472c3f -s ours am: 6b5a5a0e22 -s ours am: e6b29cbc26 -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: I84f890906eca277786e3e0374d1af3cf8637a436