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

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

Change-Id: I6b76788e056d8b1fbaa2cdc845aaea0d78985868