Merge Tap & Pay settings entries with NFC

Bug: 142231537
Test: make -j42 RunSettingsRoboTests

Change-Id: I45987f538f444f898d50379d45546b04086d44d1
1 file changed