[automerger skipped] Merge Android 12 am: 2fe2cb483c -s ours am: dd52d333d7 -s ours am: 6137137101 -s ours am: 97ced632fc -s ours am: a8a2a7cdfa -s ours

am skip reason: Merged-In Ibf8093550cfde749db7ba78ff1d462e090b920ce with SHA-1 5a7c594526 is already in history

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

Change-Id: Icebeb0db48460ef73bce966e1240a61604891bab