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

Change-Id: I216a41d4f0fd536c75a361d9a93f44904a3bfafd