[automerger skipped] Merge Android R am: eff63e124a -s ours

am skip reason: Change-Id I98b9f287a2881ec98f6f69d6089fa0190a0ee2fe with SHA-1 37bf391cce is in history

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

Change-Id: I5ae622f0218bb5564f2c267eba964488b0a3d0e7