Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I75e8e09c230cfb805ab3b2d6699aca2cd2514eac