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

Change-Id: Ie485f727c635bbfbf0de5f4e4cb0081674bacdea