Merge \\"Angler: NFC: Fix NFC chip type.\\" into nyc-mr1-dev am: 62ea61d032
am: dcff1776e1

Change-Id: I408957e71c0c69ef933f5944e5e196acb1050457