[automerger skipped] Merge Android R am: 83f46cd36e -s ours am: 9235804b2c -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: I5384613f4a1326a460051ab27af6e93a7e4ddddf