[automerger skipped] Merge Android 14 am: eb0609deb3 -s ours am: 94e6979c5f -s ours

am skip reason: Merged-In I7378416e788f20ebb3f8d1d065d60964dc76eb99 with SHA-1 39cb5b3569 is already in history

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

Change-Id: I6fcf9bfa9e696f1c7e78e51bda38ba8e0edd5b6a
Signed-off-by: Automerger Merge Worker <[email protected]>