Merge "hwcryptohal: VTS caiman bug" into main