Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825

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

Change-Id: I0fda8c0922e45b45a4fb2b10431289724ea26851