[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 021a10bf68 -s ours am: b18f38e26d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2a27fa974a6d85de20d142081630831e2dc8bcbe