Merge "Add an aconfig flag for media.c2 AIDL InputSurface impl" into main am: 4024f1c0c2 am: e2373a69d8

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

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