Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dd am:...

Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dd am: 70a60624 am: cbb99980

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



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