Merge "Emergency SMS carrier config flag"
am: 36a9fa62be

Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017