[automerger skipped] Merge "Merge Android 12" am: ee28c23464 -s ours

am skip reason: Merged-In Iccee4ffe208d24468016c890d7eb0119c0773045 with SHA-1 ed35f1a67d is already in history

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

Change-Id: If42517f2be9a1c405259cb96fdd3da1400a2a53a