[automerger skipped] Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" am: c1e5c3ea82
am: 22590b06e8  -s ours

Change-Id: Id9ad6c651594b9ed1306657ab3bcb53278a566e1