Fix OTA issue with vts fixes for new fbe framework

Fixes for kernel encryption vts test need multiple encryption
flag support which needs additional changes to ensure IV is
generated and calculated correctly for all file systems and
storage types.

Ported and fixed the merged conflicts in cqhci-crypto-qti.c file
(cherry picked from kernel_msm-4.14 commit: 3309411)

Conflicts:
	drivers/mmc/host/cqhci-crypto-qti.c

Test:
1) Flashed Q meta, create multiple files under /data.
2) Build R (include changes topic: 660_OTA_FIXES) and flash
   APPS images of R except userdata and boot the device.
3) Device booted upto UI.
4) Files created with Q build retained.
5) Created new files under /data and checked retention across
   multiple re-boots.

Change-Id: I78ffe24be53056270caebcb6d37924c7c25c1ece
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Signed-off-by: Jiten Patel <jitepate@codeaurora.org>