Merge "Fix CtsFsMgrTestCases failures" am: 661c65dc07 am: a5fb17a6d3 am: 6d8c4ede23

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

Change-Id: I03a7fee0bfa93cba2ff8d34034fb3d832dbacfa0