Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"