Merge EthKeyringController into KeyringController
#3830
Merged
EthKeyringController into KeyringController
#3830