Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc420322 am: 388980d8 am: c1db6c05 Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d