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

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

Change-Id: I3f9226521f344345a0b1021748ee073bb38b020e