Merge "Authentication state stays on enrollment mismatch" into udc-qpr-dev am:...

Merge "Authentication state stays on enrollment mismatch" into udc-qpr-dev am: bd8f26ea am: 1201ba30

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24147068



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