[automerger skipped] Merge "DUT can not show carrier name correctly." am: 2190c3e4 am: 56fce8ad
am: efba9be0 -s ours
am skip reason: change_id Ia76c081085d9083cb9b8e3d15d5992676e9e2836 with SHA1 c0b7fdb0 is in history
Change-Id: I6a526fe1284b1e6643de801404d1bfa12a61f21d