[automerger skipped] Merge Android 12 QPR 3 am: f979563284 -s ours am: 90c31720fe -s ours am: 330d97f826 -s ours am: 0ea0d67a48 -s ours

am skip reason: Merged-In I80c2d77c1617a3ff624467f2fb35d38fc04548f3 with SHA-1 d13ada0818 is already in history

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

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