Merge "Fix negative size when size is greater than 2,147,483,647" into sc-dev am: 7725637ad8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021912

Change-Id: I5edfdfbae0f37c1fe2ccd79385db28782036d756