Merge "Pass SdkVersion to getNeighboringCellInfo" am: cec3f1fafb
am: 8f4fdd4e78

Change-Id: I1397d457efe3c1758795aace2f05ed330a92e596