[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: fa281650cf -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: I0148c76ca448a20d33c50efbddb63738834300ee