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

Change-Id: I5561e849cce8d86f50f21cf1ddb3b17f9b986d6a