Merge CR2660953 am: 8d1057762d

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

Change-Id: Ideac3f7301e334ba6ac0eb8495bcc13dc834788e