Merge "Fix extra password confirm prompts during managed setup." into sc-dev...

Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e55 am: fd115c5d

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

Change-Id: I7b3af9b3a11572706110082206b7ec56883b06ce