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

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

Change-Id: Ied9c9fc828c28e9de6ceb350afe6bd2249d8dc9e