Merge "Bringing up APV SW codec" into main am: 6da4766158 am: beaa45f163

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

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