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

Change-Id: I912379c96b0fa8bf860a2a5ea7f5169b01e609d2