[automerger skipped] Merge SP1A.210812.016 am: f58241331a -s ours

am skip reason: Merged-In I144517eec1ee985d1501b4e3fe7314e7d0c86ab3 with SHA-1 8547df061d is already in history

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

Change-Id: I4153f44099e9678a4c7820e62f94e9cd658f045b