MediaBrowserCompat: Refactor class hierarchies

Change-Id: Iac6c823a6eeadb81a8af8c09a2103730a61e933c
(cherry picked from commit 54caf35ec18c425904bb4d1f442b676c298e5ff4)
9 files changed