[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 75acba49ec -s ours am: d75619075d -s ours am: 3e8b9f0531 -s ours

am skip reason: Change-Id I2428f78ab3867a99ff2ee34173b21f451269398a with SHA-1 c4203989b1 is in history

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

Change-Id: I9d31fa3717a077084dc28f898a1dc268932acbce