[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 73278bedcf -s ours am: 7f8d796486 -s ours am: 637eb63add -s ours

am skip reason: Change-Id Ifb40c05ce8c1ace2166f1c84443c2dd763265993 with SHA-1 8fcd2841bc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/12470263

Change-Id: I3e9220aecbbdc23e06405b0760796ce5fd84f1b4