Merge "Move biometric errorMsg supression to its own helper class" into...

Merge "Move biometric errorMsg supression to its own helper class" into udc-qpr-dev am: 1f29987f am: cb20983b

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



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