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

Change-Id: I16e7aaf32f49433e9d1229412650bc44164900ff