Merge "Throw SecurityException for Q+ getNeighboringCellInfo" am: 90d517b07b
am: 8ceebb3537

Change-Id: Ibac116b85973e39550b2a10d8f42ce65b4060b8e