Merge "Always play haptic on UDFPS reject." into tm-d1-dev am: fb18e86f59 am: e5c15102f1 am: 1ec3df7d32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946388 Change-Id: I82b8df4ce9a0acb41de61efb3b08bbf06c8a48d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: