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

Change-Id: I9b184b4fc5b2bc33f51cdaf810a305aaf9c89b33