Merge "Keystore 2.0: Remove Keystore 1.0 and remaining references" am: 811b97c066

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1626321

Change-Id: I148da3b24ab49df52dbf24d60cb359331af89416