Merge "Make NFC AIDL callbacks oneway" into oc-dev