Merge "Hide enrollment options that don't match requested biometric strength"...

Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c am: ff7ae412

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



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