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

Change-Id: I68e8e0754c970a11d53c9056838a83f65be4e341