[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 63cc032b09 -s ours

am skip reason: Merged-In I074cceba05c05c61c1e118d639684010faabecfc with SHA-1 9a3d5e3e1a is already in history

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

Change-Id: I550f273918388b8059456e074a57230f97e5d340