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

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

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