[automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
am: dde6e031f7
am: 56cd70f100
am: 13d84b4a96
-s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a
is in history
Change-Id: Ic7632df1451510589541b7c401e3580759e9b89f
This commit is contained in: