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

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

Change-Id: Ief663bcc34dddadea932488ba1aaac0ea2718fd9