Merge "hwcryptohal: VTS caiman bug" into main am: c158789518

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

Change-Id: Ic31751e81b3d74236e052bf2d32155efad802d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>