Merge "Set missing CSD for APV codec in Muxer" into main am: ae85d021d3 am: 95714538ac

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

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