Merge "vold: metadata encryption: ensure F2FS GC targets correct device."
am: 3adf30745a

Change-Id: I9df60bbc12d7c70c0bd0fbda1e8604051306a8ee