Merge "Make NFC AIDL callbacks oneway" into oc-dev
am: 1573489991

Change-Id: Ie0e8471a3998bdb2fefde6c67823b71a889e0d81