[automerger skipped] Merge Android U (ab/10368041) am: a204553cec -s ours

am skip reason: Merged-In Ieb008c840554874294cb0d2ec5679c771e698698 with SHA-1 cf2376a1f9 is already in history

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

Change-Id: I98e2093d76780934a99250944d554a79863aad4c
Signed-off-by: Automerger Merge Worker <[email protected]>