Merge "Make NFC AIDL callbacks oneway" am: 99c805b319
am: a50b393781

Change-Id: I510c06bb3c3fc74ec31baa6b5d3e3c2888067da6