[automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
am: 97cc247663
-s ours am: 09ed274f05
-s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a
is in history
Change-Id: I370528bfed63bf996822d007e95352a14f1b95c9
This commit is contained in: