Merge "servicemanager_fuzzer: fix ODR" into main am: f6273276 am: 4479431f...

Merge "servicemanager_fuzzer: fix ODR" into main am: f6273276 am: 4479431f am: fd193e87 am: 6a2c85cf

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



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