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

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

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