[automerger skipped] Merge Android 12 am: 239030b272 -s ours am: ef26e50f39 -s ours am: 7f15eaec98 -s ours am: 9a3d5e3e1a -s ours

am skip reason: Merged-In I0a1bcf30e04204c56c7fed91e4dfa4af80346404 with SHA-1 3766a094d3 is already in history

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

Change-Id: Ife847da564c9160669fd2438bea7307d23aad58b