Merge "codecServiceRegistrant_fuzzer: Bug Fix" into main am: f84f2fa787 am: 606ece6103 am: ab26e7a895

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

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