[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 2da4d799c7 -s ours

am skip reason: Change-Id I481d870a5b390bcee76e68a02d8fb2a8299d6bd4 with SHA-1 4da961f869 is in history

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

Change-Id: Ie54e5d06722d866888bf58ae3202a5f4030d4897