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

Change-Id: I63df676bf2270532c84cb950e4cac13858fbd4fb