[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 5a7c594526 -s ours am: 064255bd8e -s ours am: 2848609553 -s ours am: 611df5fbe2 -s ours

am skip reason: Merged-In Ic16933528208098e47018a4d024509a528bf91e9 with SHA-1 5380476154 is already in history

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

Change-Id: Ifbaeff0acd6d55600a7c11cd8d8e637e5e275000