Merge changes from topic "libmtpFuzzers" am: f9d7ef898f am: 744263bfd4

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

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