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

Change-Id: Ic209a039351987f0f2ac31ed71bff80abf8fdcb2