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: I32170d798518d00236b3d0c7fa648cbdb45ffd33