Merge "Consolidate WiFi Calling string resources" into nyc-dev
am: 070b73a

* commit '070b73a46d7344b8a1c771ab537c30c08d078051':
  Consolidate WiFi Calling string resources

Change-Id: Iae5ab0c3f42b18e751bac38d8abc39473ec63927