Merge "Add authenticator-aware string methods to BiometricManager" into sc-dev