Merge "Redirect to the right combined biometrics in work profile." into...

Merge "Redirect to the right combined biometrics in work profile." into udc-dev am: 37dad2b3 am: ea8f9dd7

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



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