Merge "Support MediaBrowserService in AOSP Music"
am: 25e17f5eb0

Change-Id: I50d4360672028cdc437fbfc647762673ece50c85