Merge "SUW enrolls FP before Face" into tm-d1-dev am: 179b83ac am: 9896d485

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



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