Merge "Make NFC AIDL callbacks oneway"