Merge "NfcAdapter: Remove dead AIDL methods."