[automerger skipped] Merge Android 12 QPR1 am: bdad8abdb0 -s ours am: 8452f36bc3 -s ours am: d89fe19f9a -s ours

am skip reason: Merged-In Id0a35797d5016e3fb3f8d58a75ff84a55eb413e7 with SHA-1 63cc032b09 is already in history

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

Change-Id: I09548cb58b1c8b6ae5dc983cbdaae95fa3b99d51