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

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



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