Merge "Explicitly cast to 64bit integer when calculating filesystem size" am: 10a8797ce0 am: 83f5476b3d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe4b041bf28881c21a683ca6d9c42944e098c928