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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d2bc6467b35b2df1aff79e4765bdd103c7b572a