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

Change-Id: Ib41c7a56ce7f0f499a49580b3c23712d3df81477