Merge "Remove new task flag when launching unicorn enrollment." into sc-dev am: afe9dad1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521773

Change-Id: Ifef299dd48092219f382ef65088bc7a047af29f2