Merge "Update BiometricManager constants to be more clear"