Merge "Fix carrier config string typo." into qt-qpr1-dev am: 0b5967db15

Change-Id: If354e796e1172ac3e10e0d95e1b29912d98d4dcb