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

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

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