[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: ac9145a492 -s ours

am skip reason: Merged-In I4a85388c7caaf3f46331cda7b020361e6414c418 with SHA-1 f079aab7bd is already in history

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

Change-Id: Ia4a156da4a300f95255feea1084ccb17bd8a27f8