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

Change-Id: Id812ccd05fd4efd0fdc9e07d083a29f6f0756d7e