Merge "libstagefright_writer_fuzzer : Bug Fix" am: ec578c8b am: d4ddd4b6 am: 901145c5

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



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