Merge "Add APV Support flag" into main am: c2fd39dfe1 am: 5f0f431e83

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

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