Merge changes from topic "fsync-fixes" am: 6c36c6f421 am: 2a3e67a9e0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf2e04c47b38e917bf58afcfbd78b7a0a395c141