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

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



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