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

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

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