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

Change-Id: I5b7f6843f73764f7a0ae24ccf15e012ee73556bc