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

Change-Id: Iac671407a301c933ab1bda0dadafcaa1573cc7d0