[automerger skipped] Merge "Fix potential overflow in WAV extractor" into...

[automerger skipped] Merge "Fix potential overflow in WAV extractor" into oc-dev am: e2b1c22f am: 7bca01a4 am: f34c91d2 -s ours am: 7e3c0ce9 -s ours am: f8979825 -s ours am: 2bccb468 -s ours am: 198ae0ca -s ours am: eb6d72b7 -s ours am: ba040555 -s ours am: 36d8a9c9 -s ours

am skip reason: Change-Id I73edd5fc0da80dc2cdd26c6fcd09496b2c828ba9 with SHA-1 7e151103 is in history

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

Change-Id: Ie09e019e50134acee30bdbb2e7481f2172f5e049