[automerger skipped] Merge "vold: metadata encryption: ensure F2FS GC targets correct device." am: 3adf30745a
am: 61ab6986a6  -s ours

Change-Id: I94fb53a5098a8ab55b8079b2810ae011b6dcc5d8