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

Change-Id: Ibfcd1ac0d41c8036d84104adf2a5f3f7eff35adb