Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev