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

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

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