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

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

Change-Id: I4cb72cd1006d60c1bc8778e3762148264b686a00