[automerger skipped] Format media control files am: 0d8858f2 am: 24062080 -s ours

am skip reason: skipped by user ethibodeau

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



Change-Id: Ic5ff875c6076201d4ed5e09b0ac89136fe214d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>