Merge "String resource edits for Telephony" into lmp-mr1-dev
automerge: e8092f2

* commit 'e8092f20a5d19829c07359848a633a5dcc7ef556':
  String resource edits for Telephony