Separate encryption key storage from device

Fixes: 147887130
Test: Unit tests pass and association successful

Change-Id: I99b91ce01a3dca6c376b0519ff42ae500266400f
11 files changed