tree bf03a4f23754e0a2b8cbec775376392e63880f9b
parent 492e1e25328dedd12850c733ac7bc721fbd672c1
parent 712c3d6e04b7a1be825473606e2d4bc54d4284f8
author Xin Li <delphij@google.com> 1599795234 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795234 +0000

[automerger skipped] Merge Android R am: 83f46cd36e -s ours am: 9235804b2c -s ours am: 712c3d6e04 -s ours

am skip reason: Change-Id I326820c4a876960b20b9fad780399cd4c451b6c5 with SHA-1 eda7fc5438 is in history

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

Change-Id: I2443b175279e62665cc6fac4cd6a282b29dcdc30