Merge "Add new key purpose Wrap Key to KeyProperties.java and KeymasterDefs.java."