[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: e2249642 am: c90c936c am: 3ee6a7ca -s ours

am skip reason: subject contains skip directive

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

Change-Id: I830d36c3cd81389ab6c39fcaf2b31e62d87e7a45