Merge "Fix signed integer overflow" am: 9943091884 am: f0292e9014 am: e7e87e61aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1487116

Change-Id: I1db619dc62e89fbd9d00a14c4eb7141e715f16a0