Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1
am: 2602e5ff62

Change-Id: Ifd7054cb269edbc7728e1ad561a012ff858cdad5