Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6 am: 79dfe789d9 am: 49c53ff16f

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1420895

Change-Id: Ia5ebe80acee98a90e2cb097766b3a98d10cd14c8