Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f am: c1db6c05d0
am: bbc00c877f

Change-Id: I1a84b4ce4215136f30ce7936581ee80230c8abbc