Merge "Keystore 2.0: Remove references to Keystore 1" am: 91ee4158dc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663081

Change-Id: Iba43817b8254a4b02554d2e98092b249e73290ba