[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a1fc3d6428 -s ours am: adc142784a -s ours am: 4987a0291e -s ours am: ec0ee903d8 -s ours

am skip reason: Merged-In Ieae6aa97bd6fd4ce3851a8887c0818d8dfa53848 with SHA-1 99847b6faf is already in history

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

Change-Id: Ia2b27d7ec235a11eb47dc8c2d6b18c6eb5186c2a