Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c am: 77041ef7

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

Change-Id: Ic3dda45eb8782cc8f4459beb1992136e56f7990d