Merge "LocationAccessQuery builder changes and tests" am: d6d17537ba am: 2301b5e265

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

Change-Id: I955d4874e592c25925ce39e210f72157f019439d