[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 09fa724516 -s ours am: 3fadf8bbb9 -s ours

am skip reason: Merged-In Idd9a809d1877d428f7b33076a45a1be0c962c5b6 with SHA-1 73bf3009aa is already in history

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

Change-Id: Idfd0904e0ed968977474a7239590f201d8600721