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

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



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