am 15621e00: Merge "String resource edits for PhoneCommon" into lmp-mr1-dev

* commit '15621e002721e676a32d73f4f338b66955b1e96e':
  String resource edits for PhoneCommon