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: e30a7178 am: 54b7ac75

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



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