Merge "media: add more feature flags" into main am: d971c58c am: 73338eb7

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



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