Merge "Add APV codec support to Platform muxer" into main am: 494d36a901 am: 064b46ead8

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

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