[automerger skipped] Fix Managed Provisioning crash on OTA am: e0df0d82b3 am: cfa2ff48af -s ours

am skip reason: Merged-In I716b4aded965af7730860804646317eae7321d7b with SHA-1 2dba964ca7 is already in history

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

Change-Id: I5985096fd0a142a68a7b4056bb89a8c124879be3