[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 4c58ffbfce -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: Ie191ecc6e3d489c6c0fa9d6d972dc5a36ba1a4c6