[automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 9e94fc6afa am: b757cdbe07 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 86a6cb8ead is in history
Change-Id: I8c6f23a40706dad990a3fb746ae14c3203b69ef8
This commit is contained in: