Merge "Revert "Add CTS to check for both PackageManager.FEATURE_FINGERPRINT features""