Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev
am: 9b1f560ee5

Change-Id: I00c1560589e67279a007d182b1a7c0aba9be2f79