Merge 'File and metadata encryption changes from android-4.19.96-107' into msm-4.19

This brings fs/crypto and block/crypto support changes and fixes for new
FBE framework to work with inline encryption hardware. Also it enables
dm-default-key driver and wrapped key support changes for metadata encryption.

Conflicts:
	block/blk-merge.c
	drivers/scsi/ufs/ufshcd.h
	fs/ext4/inode.c

Change-Id: Id9349c76c5deb6dabc365bc85d0431ac6c0966fe
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>