Merge "Move NDEF URI helper method into android.nfc.NfcRecord"