[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: 481877323d -s ours

am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history

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

Change-Id: I9dfb916e1ccac1ab72b286fb05a8ac67d7a1a8e6