Merge "Construct NeighboringCellInfo from CellInfo" am: 9257722c5c
am: 921acac430

Change-Id: I0f28057985625446af9a978867c77ae1702e74b7