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

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

Change-Id: Ia2d1cec64c9b64ba65fec55cb53a012ad15ae4cb