[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 4c58ffbfce -s ours am: f7b6ee929c -s ours

am skip reason: Merged-In Icdef5c307b4fc8487f5bab9c4aa65f910b970ebb with SHA-1 8be508f6c1 is already in history

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

Change-Id: I63e1005c55f1c4142c45966be9d7a9f8e194dbc9