[automerger skipped] Merge "Merge Android 12" am: ee28c23464 -s ours am: d0c76d3e83 -s ours am: 73946c4b17 -s ours am: 54e8b0c78f -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: I358de5dc22644e8912ead87d86d482cbf004df87