[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 602f4dd1cc -s ours am: 761661c4b5 -s ours

am skip reason: Change-Id I2134676a178c19da694127050b3998b7fc1a357b with SHA-1 59aac7543c is in history

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

Change-Id: I0e23b5df16f8061bd713b9e53fe754504714d1dd