Revert "Make keystore a core service"

This reverts commit 7fd8e853e96f7b223d3744c84a68acc74f57657f.

Test: still see keystore process running
Bug: 112038744
Bug: 150267620
Change-Id: I4fe3c6aeecf960377671d11be0a4dc9fa60dfb18
1 file changed