Merge "Codec2Client AIDL: config output surface consumer usage" into main am: 4dc976749d am: bc51315f02

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

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