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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a1177ce83424288c18e1486d88228fde817c7ea