Merge "Pass SdkVersion to getNeighboringCellInfo"