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

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

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



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