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

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

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