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

Change-Id: Ie901a1fa9169addb46039c36326f391800ba56cb