[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc -s ours

am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history

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

Change-Id: Ifb2353ea2966a4a0a8ee586b30a803dbf2e4dd07