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

Change-Id: Ie1eeb05332e670875704602c1a79ce17972a2e69