Merge "Merge remote-tracking branch 'remotes/aosp/upstream-master' into merge-cros" am: 336c2123e8

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

Change-Id: I4a1bb100dd0104b9262f9b714db0d8c87390c836