Merge "Fix KeyChain.KEY_ALIAS_SELECTION_DENIED"