Merge "Update counters for session encryption to start at 1." am: ae97b320...

Merge "Update counters for session encryption to start at 1." am: ae97b320 am: 61856cc9 am: d4a71792

Change-Id: I54af1835b167f1ed980b510e3acb11f26e39a5da

identity/java/android/security/identity/CredstoreIdentityCredential.java

@@ -152,8 +152,8 @@ class CredstoreIdentityCredential extends IdentityCredential {
             derivedKey = Util.computeHkdf("HmacSha256", sharedSecret, salt, info, 32);
             mReaderSecretKey = new SecretKeySpec(derivedKey, "AES");
 
-            mEphemeralCounter = 0;
-            mReadersExpectedEphemeralCounter = 0;
+            mEphemeralCounter = 1;
+            mReadersExpectedEphemeralCounter = 1;
 
         } catch (NoSuchAlgorithmException e) {
             throw new RuntimeException("Error performing key agreement", e);