Merge "Keystore 2.0 SPI: Implement modification time."