Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev
am: d4932d9b5d

Change-Id: Ic006b5ab9159885606bdb47a792b5b8d7e9a62ca