Merge "Revert "Make keystore a core service"" am: 4b6865baa0

Change-Id: Id6a961dc1bfec6083c9f749984ca1b0c213126eb