Merge cherrypicks of [17587806] into rvc-platform-release. am: 9840a194b2

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

Change-Id: Ia6c5b1d87d219da09469ea528fb24be511135226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>