Merge "Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)" into sc-dev am: c584a39e am: 98142eb1

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

Change-Id: I64b8e303214af4f2dfbe6d2930668a53abb523d5