Merge CR2660953 am: 8d1057762d am: 8979138d30

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

Change-Id: I9b80684699b9166c7bf34ea47cdd297aaf7df460