[automerger skipped] Merge "Make APIs in the base CellInfo class public." am: 987d1d04d7 am: df68a79d0f
am: 2740607256 -s ours
am skip reason: change_id I591c500136ac1f28d9cb87cd1649fd891e1315f6 with SHA1 54e43e65e0 is in history

Change-Id: Icf54d5fd697b39731a930cd4c556a5da3daff821