Merge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433
am: 660d68539a

Change-Id: Id9beb9fe1e6f7e464fe148a352192369fc1f38db