[automerger skipped] Merge "LocationAccessQuery builder changes and tests" am: d6d17537ba am: 2301b5e265 am: 4ff1055b39 -s ours

am skip reason: Merged-In If6791955d360d019e175cc9255126fd956faae87 with SHA-1 c4a3e42c74 is already in history

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

Change-Id: I0b3b0496f4ce22429d50075b424c775a765eddf2