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

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

Change-Id: I9cde0d9e70b389b91bde9b3384f82887259c9c74