[automerger skipped] Merge Android 12 am: 322af5c163 -s ours am: a0d9d9707d -s ours

am skip reason: Merged-In Ic983f30d9643eb1d0af6fd3339c0a2ba38f043a0 with SHA-1 09fa724516 is already in history

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

Change-Id: I986a296f2cb6ecd322b53910cb42622cddfe4ee4