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

Change-Id: I8c65c2a23cf5067125019aa1affc730eb3eaf234