[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 37bf391cce -s ours

am skip reason: Change-Id I531ba3c01b643f86d4c68c781669068cacf71dce with SHA-1 494f571de2 is in history

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

Change-Id: Ia65fdc06ee5c7223c6d20a58e7f295629e4323fa