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

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

Change-Id: I78054fc148d39cd7728a976c1406ddf38a5d0a32