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

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

Change-Id: Id33eff44585b1e470f000470a814e27bc9fabdd9