[automerger skipped] Merge "Allow Location-off NetworkScan without READ_PRIV" am: cfe169d455 am: 1e3c83bb9e am: 5896c69d07 -s ours

am skip reason: Change-Id Ia8779004e98f63c1fca82fa6d3ccffb445d9fde9 with SHA-1 1c11dba2c1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1470262

Change-Id: If1fbe0cfcd8ade248858bceb44a1b63a03662c0d