Update conversation strings

Test: manual
Bug: 157215227
Change-Id: Ic9f3625451a0546b3b92d7113f91ee7db17b4a9d
2 files changed