[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: ce6febf0df -s ours am: 6f03661451 -s ours

am skip reason: Merged-In I90940174deabaa21444e1c3293e503ea0695cd3d with SHA-1 8da7c0b031 is already in history

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

Change-Id: I6a4592313f07541071a7ff65d0c57f6d0d283dc9