Merge changes from topics "c2aidl-service", "c2fuzzer" into main am:...

Merge changes from topics "c2aidl-service", "c2fuzzer" into main am: d65b6a25 am: be931f0c am: 3b7d976c am: 8a3dff74

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



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