Merge "Throw SecurityException for Q+ getNeighboringCellInfo"