Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am: cb114c36d8
am: b7b419541b

Change-Id: I00d955ad5e8671c57b6a3acbe1e694fbf0b28d69