hostap/hwsim: use a custom commit to update the expired certs

- use 'theirs' merge strategy

.github/workflows/hostap.yml

@@ -60,7 +60,7 @@ jobs:
         config: [
           {
             hostap_ref: hostap_2_10,
-            hostap_cherry_pick: 698c05da2bd3233b005d45873caa852bc29b32c5,
+            hostap_cherry_pick: 5679ec5c3dda25a0547a5f66407fd9b0b55fd04a,
             remove_teap: true,
             # TLS 1.3 does not work for this version
             build_id: hostap-build1,
@@ -68,6 +68,7 @@ jobs:
           # Test the dpp patch
           {
             hostap_ref: b607d2723e927a3446d89aed813f1aa6068186bb,
+            hostap_cherry_pick: 5679ec5c3dda25a0547a5f66407fd9b0b55fd04a,
             osp_ref: ad5b52a49b3cc2a5bfb47ccc1d6a5137132e9446,
             build_id: hostap-build2
           },
@@ -167,7 +168,7 @@ jobs:
       - if: ${{ matrix.config.hostap_cherry_pick }}
         name: Cherry pick certificate update
         working-directory: hostap
-        run: git cherry-pick -n ${{ matrix.config.hostap_cherry_pick }}
+        run: git cherry-pick -n -X theirs ${{ matrix.config.hostap_cherry_pick }}
 
       - if: ${{ matrix.config.osp_ref }}
         name: Checkout OSP