Merge "Use defaultPassthroughServiceImplementation for nfc." am: 5bc16ac370 am: 6ba7914286
am: bde7ce94e5

Change-Id: I2a6d3248e5023f28ec35efb78f68b6cff489eeac