Merge "KeySetManager: add keyset aliases to dump"