Merge "Remove EXTRA_USERID from NFC CardEmulation"