[automerger skipped] Merge "Fix Segv on unknown address error flagged by...

[automerger skipped] Merge "Fix Segv on unknown address error flagged by fuzzer test." into sc-v2-dev am: c67aa915 -s ours am: 9b9bc75c -s ours am: dce42668 -s ours

am skip reason: Merged-In I255cd68b7641e96ac47ab81479b9b46b78c15580 with SHA-1 99d0823c is already in history

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



Change-Id: I336a76cba16014c0ae7b1f5363d7a954bb748265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>