Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev