Merge "vold: Support Storage keys for FBE" am: 8cfb530357 am: aafbd4066a

Change-Id: I8beed2f9939aada8735df5b9c5d0deb9bb3eb5ce