Merge changes from topic "c2-aidl-test" into main am: 0f41381a

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



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