Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c27

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

Change-Id: Ifd1170ec68c475d2064572378f02a06224734e1b