[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 1387b65893 -s ours am: 0e55ff1630 -s ours am: f5abf6194a -s ours am: 992c9fdc95 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7c72f5d70b5fe64ca2502f9fc24261219390fe26