Merge "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6f3 am: 9f4239423d

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

Change-Id: I158c42c5e92a864e91a1594b4a07884b991d63f4