[automerger skipped] Merge Android R am: 83f46cd36e -s ours

am skip reason: Change-Id I326820c4a876960b20b9fad780399cd4c451b6c5 with SHA-1 eda7fc5438 is in history

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

Change-Id: I8f477634d0f86fbca566142a8311b56e021f41b2