Keystore 2.0: Remove references to Keystore 1.0

Bug: 171305684
Test: N/A
Change-Id: I295728dba0a1dab2f8fd0e3c46cb0e239d1c72d7
2 files changed