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

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

Change-Id: I8685c025468448e6ebf13261e5fb46e6d578448c