Merge mainline-release 6664920 to master - DO NOT MERGE am: b01d5c4516

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

Change-Id: I1a2d052e7899e0be885f2458a273ce243f759e90