Merge "Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fa am: 8f4fdd4e am: 3193926e am: 6493efa7"