Merge "Check FEATURE_FINGERPRINT before trying to getSystemService"