Merge "Fix link-type check warning on com.android.nfc_extras"