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

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



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