Merge "Use P SDK Constant To Check NeighboringCell" am: 68f322ab62 am: f6bb9e4baf
am: 378d5e6184

Change-Id: I6d3f944b578c2de63f80632f8f1ead38a7fadd4c