Merge cherrypicks of ['partner-android-review.googlesource.com/3016322'] into sparse-12820175-L22100030008640651.
SPARSE_CHANGE: I82e3fd6f9181b2578d9551b9ab78c28e5a513012


Change-Id: Ic8817cbd770a0b191123c5cb9884baf01aa0a9fa
Signed-off-by: Coastguard Worker <[email protected]>
diff --git a/zuma_defconfig b/zuma_defconfig
index 73c6684..844b542 100644
--- a/zuma_defconfig
+++ b/zuma_defconfig
@@ -209,6 +209,7 @@
 
 # private/google-modules/soc/gs/drivers/ufs/Kconfig
 CONFIG_SCSI_UFS_EXYNOS_GS=m
+CONFIG_SCSI_UFS_CRYPTO_SW_KEYS_MODE=y
 CONFIG_SCSI_UFS_PIXEL_FIPS140=m
 
 # private/google-modules/soc/gs/drivers/usb/Kconfig