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

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



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