Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330 am: 7fe08d0272 am: 7c1f9fbbe0

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

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