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

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



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