Merge "Send error if enroll is invoked when face is already enrolled" into...

Merge "Send error if enroll is invoked when face is already enrolled" into udc-dev am: 78ae4649 am: de7eff14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22651490



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