[automerger skipped] Merge Android R am: 0870f9d7e8 -s ours am: 1a657cd147 -s ours

am skip reason: Change-Id Ida5549b52c29abc2a7305c32dccc955d331937c2 with SHA-1 443bd55ac2 is in history

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

Change-Id: Ie161047186da265b59c7a0458ffae384ed838a2a