Merge "Allow Location-off NetworkScan without READ_PRIV"