[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: e515be4ff4 -s ours am: 955239feb4 -s ours am: d7ca671294 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib858ab08e7504a125575f7fc5d537820cdd8fe31