[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 8490b9defd -s ours

am skip reason: Merged-In I678beaf342a43b788c6b207b1659a081ce4e82d9 with SHA-1 8a7315c804 is already in history

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

Change-Id: I2d443df7c76ee10661f670ef3ccbf3f56346b1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>