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

Change-Id: I2ae4702a288943cee889edd03a565ad2be39ac30