Merge CR2660953 am: 8d1057762d am: 457ec7749e am: e2b440d98f

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

Change-Id: I7edcda50d259206672dce300b496124c0a9d443b