[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am: bcd128d500 -s ours am: 29144c235c -s ours

am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history

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

Change-Id: I60e28a4627f6702303cd5cf3a96c300831297c7e