Merge "Fix the 1st udfps#enroll#error always fill red color" into tm-qpr-dev...

Merge "Fix the 1st udfps#enroll#error always fill red color" into tm-qpr-dev am: b830ae82 am: ccdc720f

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



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