[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: d85bcd50c6 -s ours am: fa085ebc92 -s ours am: 103f8abd18 -s ours am: c8a83354e5 -s ours

am skip reason: Change-Id If3a33e47082d9156a0d760849ceaae3a08be8a7d with SHA-1 01f30e42a9 is in history

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

Change-Id: Iaae6f375ed73c4f81a4c0effb187b7031868c196