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

Change-Id: I8c89863797a50d7e2f3f9b958b8bb3bef2b0213f