[automerger skipped] Merge Android R am: 83f46cd36e -s ours am: 9235804b2c -s ours am: 712c3d6e04 -s ours am: 27f3e7ac6a -s ours am: d194f32a26 -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: Ic3549afa17b01ea5788f87f4d390aee6d7b72198