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

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

Change-Id: I7eaa20793df00149c32d2f5231467eb918d96e33