Merge "Support MediaBrowserService in AOSP Music"