Merge "Show a dialog preventing face enrollment in split mode." into udc-dev...

Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be am: a27d94d7

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



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