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

Change-Id: Ia3defe8f38353b561d8719d5b3b40373ad1e3cd9