[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: 481877323d -s ours am: b944ee3a9a -s ours am: e926696ab4 -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: I6853d006b3e606871285b5d362768d80956b2a7a