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

Merge "Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c am: 03dc7172" into sc-v2-dev-plus-aosp am: 5f290c28

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

Change-Id: I42920f1f753ab2a2f14b972f622e7b4f52f253c9