Merge "For devices w/o haptics, show bouncer on biometric fail" into tm-qpr-dev am: 1c0ca5ca

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



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