[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ed35f1a67d -s ours am: 613b139b18 -s ours

am skip reason: Merged-In I889df6bc8c2d4e97c43bbd83410b12d6c8becd25 with SHA-1 8af0d687f4 is already in history

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

Change-Id: Iaa75092f6594ed2986faa51e688f38ea302a1716