dataconnect.yml: fix missing cache keys when saving to cache

Author: dconeybe

.github/workflows/dataconnect.yml

@@ -27,6 +27,8 @@ env:
   FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '13.29.1' }}
   FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
   FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
+  FDC_GRADLE_CACHE_KEY: gradle-cache-jqnvfzw6w7-${{ github.run_id }}
+  FDC_AVD_CACHE_KEY: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-${{ github.run_id }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -80,7 +82,7 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-cache-jqnvfzw6w7-${{ github.run_id }}
+          key: ${{ env.FDC_GRADLE_CACHE_KEY }}
           restore-keys: |
             gradle-cache-jqnvfzw6w7-
 
@@ -124,7 +126,7 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ steps.restore-gradle-cache.outputs.cache-primary-key }}
+          key: ${{ env.FDC_GRADLE_CACHE_KEY }}
 
       - name: Enable KVM group permissions for Android Emulator
         run: |
@@ -141,7 +143,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-${{ github.run_id }}
+          key: ${{ env.FDC_AVD_CACHE_KEY }}
           restore-keys: |
             avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-
 
@@ -163,7 +165,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: ${{ steps.restore-avd-cache.outputs.cache-primary-key }}
+          key: ${{ env.FDC_AVD_CACHE_KEY }}
 
       - name: Data Connect Emulator
         run: |