Merge "Merge "Fix "Invalid card" text on CarrierTextController" into qt-r1-dev...
Merge "Merge "Fix "Invalid card" text on CarrierTextController" into qt-r1-dev am: 96585dea am: 9e00da83" into qt-qpr1-dev-plus-aosp
am: cc6a92c4
Change-Id: Id9d29dd36130d916df168424cb6da234f68cff6d