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

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

Change-Id: Ie50997955dd2184afc13ce7c4832a43c47e5e70b