[automerger skipped] Merge "Make LocationAccessQuery's builder safer to use"...

[automerger skipped] Merge "Make LocationAccessQuery's builder safer to use" am: a863b029 am: 524b0aae am: 0ea41c46 -s ours am: 2ec957d6 -s ours

am skip reason: Merged-In Ica8779dff4c671352b917a3ccc02cdd0e1c5856d with SHA-1 d7c23516 is already in history

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

Change-Id: I0c3851307c3ab393d8fd1c1970daf992c468cd05