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

Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c am: 6febca5f am: 52186abf

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

Change-Id: Ifb663cdd4c74e646512b745875560e763594c08e