Merge "Prioritize lockout error over not enrolled error." into udc-d1-dev am:...

Merge "Prioritize lockout error over not enrolled error." into udc-d1-dev am: fcdf349d am: deb4b37e

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



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