Merge "Organize media control classes" into tm-qpr-dev am: 6e74a441

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



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