Merge "Allow Location-off NetworkScan without READ_PRIV" am: cfe169d455 am: 1e3c83bb9e

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

Change-Id: I34e91980664f536488e11b5966f9edb2df917ac6