Merge "Add TDSCDMA Support for CellInfoTest"
am: c0516879f4

Change-Id: I5a9fa5805f3a0383ede7cbc6bf8477bae0326796