Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 am: 083f9699c5 am: 8c8cf133be am: da2701092f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222 Change-Id: I517d6b8532262ad177307dc697a5c5273b360880 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: