Merge "FEATURE_FINGERPRINT is back to android.hardware.fingerprint"