Merge "Angler: NFC: Fix NFC chip type." into nyc-mr1-dev