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

Change-Id: Ief9afde6e5856b5595c58d53b2a7950aa5b7fc76