Merge changes from topic "APV_Support_API" into main am: 01cae3b654 am: d0071c16a0

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

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