Merge "Make LocationAccessQuery's builder safer to use" am: a863b0297b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695246

Change-Id: Icd029967f7bc650977d408d6110ab5a78f7e8bd6