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

Merge "[automerger skipped] Fix Segv on unknown address error flagged by fuzzer test. am: 9b2183ae -s ours am: b3273191 -s ours am: 9bc243d1 -s ours am: 2911ef2b -s ours am: 47753ee2 -s ours am: 5c28d700 -s ours am: 6c78c5da -s ours am: f894603e -s ours am: e590de4b -s ours" into udc-qpr-dev-plus-aosp am: 882ea9fb -s ours

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

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



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