[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: 791c149f am: 0b0aca55 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icb742db13d7a2280d3e3f9f90b8d44cb62c9ac74