Merge "Biometrics: Add back import needed by lint."