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

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

Change-Id: Iefc6040dc12c886dd17cac14f4a5fe93836971f4