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

Change-Id: Ie8b3b56bc8b35b531a826e10b3b58feefa3c221d