[automerger skipped] Merge Android 12 am: 957a0c4966 -s ours am: 23dee9049e -s ours am: 63349de1b6 -s ours

am skip reason: Merged-In I45c0a9d555b99f0eec04d147aa1b0483cbf50116 with SHA-1 aee2462760 is already in history

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

Change-Id: I7887168c2f6728eb33fd2bc0233f4bda6670eec5