Merge "Fix going back after biometric enrollment in SUW" into udc-dev am:...

Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c139 am: 083f9699 am: 8854736a am: 65a9252d

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



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