Merge "Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fafb am: 8f4fdd4e78 am: 3193926e6a am: 6493efa705"