Merge "No blame for location usage if no location sensitive field is queried" am: 311dbb92b8

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

Change-Id: I62fb63a5dcd18a9d93db36350413aab40404114e