Merge "Keystore 2.0: Add API for key migration to IKeystoreMaintenance"