Merge "Don't attempt caching for BiometricManager.Strings" into sc-dev