Merge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433 am: 8ae2674d04
am: 5ebc747848

Change-Id: I2ff73a3b4720131b1eb94df9c54c186c27c9f461