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

Change-Id: Id35cbd6bd8821f1e5e1d41cce76e2524c92ca47b