[automerger skipped] Merge "Make LocationAccessQuery's builder safer to use" am: a863b0297b am: 524b0aaec6 am: 0ea41c4636 -s ours
am skip reason: Merged-In Ica8779dff4c671352b917a3ccc02cdd0e1c5856d with SHA-1 d7c2351676 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695246
Change-Id: I1ad629ffec46bfaec70fed6fc6f1c344ab8fba79
This commit is contained in: