Merge "libstagefright_writer_fuzzer : Bug Fix" am: ec578c8b46 am: d4ddd4b6d8 am: 901145c52b am: b59ebd2a15

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

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