Merge "Keystore 2.0: Remove Keystore 1.0" am: 4386ba6c16

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/1621750

Change-Id: If7d8ce4a444b1621614e0c4f2755ffe43fff854e