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

Change-Id: Ie6b248924afccad0f36872e1e0dbebea56e2e926