[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 skip reason: Change-Id I73edd5fc0da80dc2cdd26c6fcd09496b2c828ba9 with SHA-1 d3d872da is in history

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

Change-Id: I969f4389d6ab7facac8f0a591dbaa992cce3a143