Merge "Add getKeyCharacteristics stub to km_compat"