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: c138d206 -s ours am: d8a8bfd0 -s ours am: 1269ac72 -s ours am: 218cac0d -s ours am: 6d21e159 -s ours am: c89b12b9 -s ours am: 6d04562b -s ours am: 64d9a91b -s ours am: f575f70e -s ours" into udc-qpr-dev-plus-aosp am: 33d7b823 -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/+/23914016



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