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

Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8