Merge "Use SDK Constant for NeighboringCellInfo Docstring" am: d264669c7c
am: 2bd1b867fd

Change-Id: Ic065be4595472c31b6a9460a30522c2b43d1a32f