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

Change-Id: I933a31eefe57b8b06513ca3e7a2ee874a1b680a1