Gradle Improvements (#2311)

.github/workflows/android-device-test.yml

@@ -100,7 +100,7 @@ jobs:
           expect-files: "${{ matrix.test.testFile }}, ${{ matrix.test.appFile }}"
 
       - name: Configure AWS Credentials
-        if: env.run_device_test == 'true' && matrix.test.name == 'Android Benchmark'
+        if: env.run_device_test == 'true'
         uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -138,7 +138,7 @@ jobs:
           testSpecArn: ${{ matrix.test.testSpecArn }}
 
       - name: Upload benchmark results to S3
-        if: env.run_device_test == 'true' && matrix.test.name == 'Android Benchmark'
+        if: always() && env.run_device_test == 'true' && matrix.test.name == 'Android Benchmark'
         run: |
           npm install --ignore-scripts
           node scripts/aws-device-farm/download-benchmark-results.mjs ${{ steps.aws_device_farm_run.outputs.runArn }}