DO NOT MERGE - Merge ab/7272582 am: 11284444f7 am: e1e4412da3

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

Change-Id: Ic4910008f846a6abb69581ccf2bf92ccc490d279