Merge "Always play haptic on UDFPS reject." into tm-d1-dev am: fb18e86f am: e5c15102

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



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