Merge "Fix CtsFsMgrTestCases failures" am: 661c65dc07

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1702765

Change-Id: I6127464577b5f7d67aa202346e4f333740661d83