[automerger skipped] Merge "DO NOT MERGE Force-enable media feature flag" into...

[automerger skipped] Merge "DO NOT MERGE Force-enable media feature flag" into rvc-dev am: c2322518 am: 1ad26031 am: 513b960f am: 2042a780 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie0f76f396083899639147bd2d8f6074f730dcfea