Merge "Removed haptic from udfps enrollment" into tm-dev am: 882cdf15

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



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