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

Change-Id: I3ec768fffe72b6c8a476e549e94103dd71a17d62