Merge "media_solutions: Add android.media.editing.flags-aconfig flag" into...

Merge "media_solutions: Add android.media.editing.flags-aconfig flag" into main am: f189469f am: 8dddb3ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3256507



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