Merge "Keystore 2.0: Implement storage key upgrade on demand."