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

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



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