Revert "Add keychain user"

This reverts commit 6541ef1562ccf93e498d653598330a7fc80ad2b2.

Bug:4970237
Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e
2 files changed