[automerger skipped] Merge "Organize media control classes" into tm-qpr-dev...

[automerger skipped] Merge "Organize media control classes" into tm-qpr-dev am: 6e74a441 am: fc817591 -s ours

am skip reason: skipped by user ethibodeau

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



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