Android T Beta 3 (TPB3.220513.017)
[automerger skipped] Merge Android 12 am: 322af5c163 -s ours am: a0d9d9707d -s ours am: dbf3e7e46b -s ours

am skip reason: Merged-In Ic983f30d9643eb1d0af6fd3339c0a2ba38f043a0 with SHA-1 09fa724516 is already in history

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

Change-Id: I8d43c78b6d3d78a8623da50c83cd92a3a97e7cf7