Merge CR2660953 am: 8d1057762d am: 457ec7749e am: 5b483a0c54 am: 8c458daf2d

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

Change-Id: I3ba5662407686e83d709724da91f5c659188a103