[automerger skipped] Merge Android 12 am: 107ad13552 -s ours am: a159210196 -s ours am: b98c000adf -s ours

am skip reason: Merged-In Id18cea8c479f6355089738a6daba741662539390 with SHA-1 f58241331a is already in history

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

Change-Id: I604b9bebaabadb768c7429d5fb4aa28cd702f477