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

Change-Id: Id0ea9a7742628e6128257d2ff0d57a0af4aefcef