[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2153bb8ce3 -s ours

am skip reason: Merged-In I97a78a9157007cc804d958dd1353ecfe83add93d with SHA-1 5cdc994bf3 is already in history

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

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