Merge "Keystore 2.0: Add support for resetting legacy user keys."