Merge "Add an aconfig flag for media.c2 AIDL impl" into main am: 5cb473bc46 am: efb192bfc3 am: 3216aad421

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

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