Merge "Do not require USE_FINGERPRINT for getAuthenticatorId." into mnc-dev