[automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b5 am: 97cc2476 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f7 is in history
Change-Id: I95b0e51c6cf838c395fa330e14561e45fa535739