Merge "Add TDSCDMA Support for CellInfoTest" am: c0516879f4
am: d4257edef4

Change-Id: If6155c9e90f387adabb6e6e60c4b2c29cd8542f0