Merge cherrypicks of ['partner-android-review.googlesource.com/3018051'] into sparse-12817294-L64300030008461038.
SPARSE_CHANGE: I10b9fc09fe21252c4a3efcb9103ae7cd93996e08


Change-Id: Ieef86b64dcf75b022ee9057008bdcdbd00ac02cb
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>

gs201_defconfig

diff --git a/gs201_defconfig b/gs201_defconfig
index 1c052ca..e61a70f 100644
--- a/gs201_defconfig
+++ b/gs201_defconfig
@@ -192,6 +192,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