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

Change-Id: I67f198abdeaea2333fe693636ce5275273e1fe71