[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 34cc8a21e2 -s ours am: d13ada0818 -s ours am: 5a0d4fc506 -s ours am: 1a36740478 -s ours

am skip reason: Merged-In I177e9d9a50ca911c4814aab27a434f28206b3b8a with SHA-1 5d98acb373 is already in history

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

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