[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: ac9145a492 -s ours am: 5a7d7d2673 -s ours am: 0b3fbf98b0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3e5a0b1afecc4fb15beb403dc2b2533c1735d6fb