Merge "Revert "Fix the 1st udfps#enroll#error always fill red color"" into...

Merge "Revert "Fix the 1st udfps#enroll#error always fill red color"" into tm-qpr-dev am: 0aa37e3f am: a7ee8e6c

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



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