[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 3fc1c89a4f -s ours am: f712645f43 -s ours

am skip reason: Change-Id I709657f2c365a07311485adde9306d4a9508be00 with SHA-1 e1efd5d6c9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I001cc474c28475b886305627ebb536e0a51d0d23