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

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

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