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

Change-Id: I01b1903a5d47188432f1eec5d522ead77db18675