Merge "Attach v2 EnrollingSfpsFragment to activity" into udc-dev am: 4951384b

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



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