Merge CR2660953 am: 8d1057762d am: 4aeb4f4b24

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

Change-Id: I14f24ff26f179e91bda7a1522d936c93f59e769b