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