Merge cherrypicks of [17570104] into sc-platform-release. am: a5649068ed Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/17807427 Change-Id: I3d924c60280783119b869404de08f2da731f64fc Signed-off-by: Automerger Merge Worker <[email protected]>