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

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

Change-Id: I0bba17d0367ebf4e1c868a8cc7471366bc7a4408