Merge "Move getNeighboringCellInfo() SDK Level Check" am: d37a7a2cd6
am: 6b0187f566

Change-Id: I4f45218dec4d0f0118930223b5b8a77e3ab9397d