Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c27 am: 6febca5f1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305458 Change-Id: Iacc469d5c3abf4df32d637234e88e91a67f1c727
This commit is contained in: