[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: e1efd5d6c9 -s ours am: dc83ec685f -s ours

am skip reason: Change-Id I2fed8c65faefcd0d1eff7f829e2d23bf20035b51 with SHA-1 d194f32a26 is in history

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

Change-Id: I04f94cfc8a24e9f45599425b91645712c280f510