Merge mainline-release 6664920 to master - DO NOT MERGE am: d0161a8ea2

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/gps/+/1430144

Change-Id: Ia869b826db3055ec966cf6432f328fb22d10a0a5