[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: eda7fc5438 -s ours am: c7da72b771 -s ours

am skip reason: Change-Id I6a07c809d90b8e567a3e5027b2eb4c499eeedb1b with SHA-1 89d54d71a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/gps/+/12470174

Change-Id: I85ad99b5906370891a740889e9d4ee5d883f0fa6