Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2 am: 8fd8c0973e am: 8c0c4c0463
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178 Change-Id: Icf3995b5d98a14b766552d8118850db37cd3865d
This commit is contained in: