Merge "Make keystore a core service" am: 04b8903804 am: 5f58b20b00 am: 73d27984f6
am: b88ae671ef

Change-Id: Ie86dd47a722b8a8cc2ee2bf5ab9391a5b028488d