Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d
am: dbbc97700e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413 Change-Id: I371cb2b04e2833582bcbf4542752e4adf0bbfde8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: