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

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

Change-Id: I4bb872c8b46fe1c102ff0219111642c96b2952e5