tree 364320bfc1a467241adc6a19049e710e6a77bdab
parent 70eaa0ea1b928357436a4f5e597c0d6d704a1d94
parent f2b9c66b6bffb550b1174a0382d3cc21a735f1cd
author Xin Li <delphij@google.com> 1624296174 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624296174 +0000

[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: ce6febf0df -s ours am: 6f03661451 -s ours am: 42efe5a3ef -s ours am: f2b9c66b6b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id0be550ad644044d24bb1339d0d5febe4227aecc