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

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



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