Merge "codecServiceRegistrant_fuzzer: Bug Fix" into main am: 2107e8a5ba am: 4d57895da1

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

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