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

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



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