[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 8da7c0b031 -s ours am: c21ab78637 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I26f9bf028ebcfcbe99e8434c7cb931e7dc09120e