Merge "Add SystemService annotation to BiometricManager"