[automerger skipped] Merge "Expose CellInfoTdscdma" am: 0b88e07ea5 am: 2c3dba9194
am: 23984e2950 -s ours
am skip reason: change_id Ia75ea9af52796729e26b85ca04fd97b6c9b80f8e with SHA1 2175839ead is in history

Change-Id: I023570a0df49d979365f3307698285da2d872f83