[automerger skipped] Merge "DUT can not show carrier name correctly." into qt-r1-dev am: b4d825c6
am: 1717f749 -s ours
am skip reason: change_id Ia76c081085d9083cb9b8e3d15d5992676e9e2836 with SHA1 a5a02e9d is in history
Change-Id: I79e1648ec4c14cc1cd82dbb907704a9d8eb3d818