Merge "LocationAccessQuery builder changes and tests" am: d6d17537ba

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

Change-Id: I9581c25ded79cef067efc4ebf10c1f6d4483f18c