Merge "Gracefully handle integer overflows." am: edbf08efe4

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

Change-Id: Ie9e65036aed6448183c45c0c526976474b5555ab