Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev
am: cb4f643b95

Change-Id: I36d7312e2e9c6a121b3297c298d4e32867c7d84a