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

Change-Id: I783a1f7ab7003067cc4f40f3cf576738e1b3470b