Merge "Implement delete_key and delete_all_keys in SoftKeymasterDevice." into mnc-dev