Merge "Gracefully handle integer overflows." am: a308f79353 am: aeddf47458 am: a2a1e552cf am: 85c6bdbbeb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I86e762f63a2e18833dcebdae4921a24a18bbf01d