Merge "Pass SdkVersion to getNeighboringCellInfo"
am: cec3f1fafb

Change-Id: I46ede415a660852938506b9bd4eebff409da5929