Merge "Move MediaBrowserService to AVRCP controller package"