Merge "DO NOT MERGE Force-enable media feature flag" into rvc-dev am: c232251896 am: 1ad26031be

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

Change-Id: Id92a8aecb94952dbca7a4c9696001201f281638f