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

Change-Id: Iad2aeea8faf434ab41202bf82d30b3f88dc19690