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

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

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