Merge CR2660953 am: 8d1057762d am: 8979138d30 am: 72a20d1012

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

Change-Id: I6bc6ca2338c50331e1086a796e403e3ee3c8e05f