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

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

Change-Id: I2b477e6da025fd53577733c8e8894f67a68ba70f