Merge "fsmgr: fix integer overflow in fs_mgr" am: be42841c61 am: 36d60f5581

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

Change-Id: I983248e8cb987130f4515fcb62052deb74e62a67