Merge "Use defaultPassthroughServiceImplementation for nfc."
am: 5bc16ac370

Change-Id: I57ab9d0d1104ad316ae8a5a642a710559a7c4823