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

Change-Id: I244b83dee81280c2fc418893ef4a04ff52586e59