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

Change-Id: Ia7d3be56ce538cbb40c72673b8c2824d0a76b82b