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

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

Change-Id: Ie57bedf58db5aeb92b252aaa9616c8879b13ad6f