Merge "Keystore 2.0 SPI: Implement modification time." am: d2e7c2e000 am: f462515bea

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c8a0ba69c125e6812cff732de406482db32bf6d

keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java

@@ -250,13 +250,10 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
             return null;
         }
 
-
-        // TODO add modification time to key metadata.
-        return null;
-        // if (response.metadata.modificationTime == -1) {
-        //     return null;
-        // }
-        // return new Date(response.metadata.modificationTime);
+        if (response.metadata.modificationTimeMs == -1) {
+            return null;
+        }
+        return new Date(response.metadata.modificationTimeMs);
     }
 
     @Override