Merge "Revert "Add android.hardware.fingerprint for pre-Q""