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 am: 04739515

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



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