tree bf03a4f23754e0a2b8cbec775376392e63880f9b
parent c7da72b7712f328c9c9fd0a3b6f4d4558b987af5
parent 9235804b2cb8c6b06338327f577e113ed83453e4
author Xin Li <delphij@google.com> 1599789783 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789783 +0000

[automerger skipped] Merge Android R am: 83f46cd36e -s ours am: 9235804b2c -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: I5384613f4a1326a460051ab27af6e93a7e4ddddf