Merge "Include the biometricEnabled state in the fingerprintEnabled state" into main