Merge "Check SDK Version For NeighborCellInfo" am: 954a5e399a am: 4d3f457d1f am: c9a36de8ea
am: e05b924320

Change-Id: Iede14991eae50483682d9845c1a5307fb36d888b