Merge "Remove STOPSHIP code from CarrierTextControllerTest" into qt-dev am: 39ac1d5012
am: 7a734a376a

Change-Id: I32f41be2dbf3febd296ce3ea2a1fb580a6a9ffb7