[automerger skipped] Merge "Use the internal max faces number to check...

[automerger skipped] Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857 am: a538195c -s ours

am skip reason: Merged-In I193c7b7c49f884541bd5d8282d15bf69e46f3392 with SHA-1 b4000fb2 is already in history

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



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