Merge "Move MediaBrowserService to AVRCP controller package"
am: 9f045e9992

Change-Id: I496d038642497cf3f79e3cce747a5c77770654d1