Merge "Add TD-SCDMA related network mode options" am: 20281e2f7c am: f5831ef556
am: f0ae69e87e

Change-Id: Icc4feffb620a28c5c8d9751fbb7ed51e0e353e0b