Merge "For devices w/o haptics, show bouncer on biometric fail" into...

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

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



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