Merge "Add an aconfig flag for media.c2 AIDL impl" into main am: 5cb473bc46 am: 14cf911ee0

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

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