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

* commit 'cbca95d73f1a4fb8a45ce1b209a94d13ed1599ca':
  String resource edits for Telephony