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

Change-Id: Iff7aab5447b3321b0868ab8bd1c1c8d4e34abb18