Merge "Keystore 2.0: Adjust executable name for keystore." am: a4a265875b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1679785

Change-Id: I9424a90e6adfba5eec862816a9bdb824709f6fda