Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e343

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



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