Merge "Address BiometricManager strings API review feedback" into sc-dev