[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc -s ours am: 66020661ae -s ours am: 50cff07bd4 -s ours

am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history

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

Change-Id: Id38ca99d3f12bb745c2dab1fdd7407e3039a0b6b