tree 364320bfc1a467241adc6a19049e710e6a77bdab
parent 4ac13b026e63291350b8cc22746e849564c89032
parent 14f58b5aab529cc89b6a17dbc44931e2772ca588
author Xin Li <delphij@google.com> 1633681803 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681803 +0000

[automerger skipped] Merge Android 12 am: 322af5c163 -s ours am: a0d9d9707d -s ours am: dbf3e7e46b -s ours am: 14f58b5aab -s ours

am skip reason: Merged-In Ic983f30d9643eb1d0af6fd3339c0a2ba38f043a0 with SHA-1 09fa724516 is already in history

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

Change-Id: I8e96cc2aa055af5286c5d1278b3c1a34914b2bd4