Merge "mediaresourcemanager_fuzzer: Bug Fix" am: 0812bf0e4f am: 16e85e4867 am: 64a546cf78 am: 4477417330 am: 0fd11aa5d5 am: de237a8ea6

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

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