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

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

Change-Id: I51ad1a1d0c02cf7541a209ec6f7c177e1f70e339