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

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

Change-Id: I27143bd10dde3abf223a6b857254444e95422a8c