Merge "servicemanager_fuzzer: fix ODR" into main am: f627327644 am: 4479431fba am: fd193e871d am: 6a2c85cf08 am: e74e494b91

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2787220

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