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

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



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