Merge CR2660953 am: 8d1057762d am: 457ec7749e

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

Change-Id: Ia9336df4896a8bd698d79b9b96cbebb5f7e6ba9f