[automerger skipped] DO NOT MERGE Force-enable media feature flag am:...

[automerger skipped] DO NOT MERGE Force-enable media feature flag am: 6965ddce am: 50bf2233 am: d9529377 am: 8835fd59 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I32ffc4a9ae5b106e06afe3bc113d5a66367cbcdf