Merge "[MS24] Remove FileUtils.sync dependencies" am: f1245786d6 am: ff3bbac2a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934457

Change-Id: I0c921d46aec1ffde844c91fc95edb8b18331198d