Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b10

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

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