Keystore 2.0: Remove references to Keystore 1.0

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