Merge "Fix overflow issue when computing ideal size of scratch partition" am: eb8079e6

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



Change-Id: I30a5580d2e8720b47b8051b1cbace5937c9dc2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>