[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6e31155b1f -s ours

am skip reason: Merged-In I2481285c598c04be8b448c88da98756daa8a19d0 with SHA-1 f8b0117585 is already in history

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

Change-Id: I8af97cd59f262cec38c82bf97ca61f8f5141c71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>