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

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

Change-Id: I224974edad14b57041c536d729900b53ce239957