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

Change-Id: I609edb12b4e59de716312baf1394b80cb05c4b13