[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: aee2462760 -s ours am: bf5b28511c -s ours am: 6a9948a885 -s ours

am skip reason: Merged-In I3ad8596103c6240ea7d1faf7b447d49bd6206a63 with SHA-1 9219e43875 is already in history

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

Change-Id: I21b5ef878e6bbc04c1368ed762c12c77cde52edb