Merge "Fix "Invalid card" text on CarrierTextController" into qt-r1-dev am: 96585dea65 am: 4d1fb4c6ed
am: 99a32a153a

Change-Id: If928117a680f0235d9704f055e3790b9b5e35a85