Merge "Fix MediaSessionManager.Callback to be called with the media button...
Merge "Fix MediaSessionManager.Callback to be called with the media button session" into oc-dev am: cadb3054
am: 33b09ade
Change-Id: Icaba651c6182835c2da2d754076ac7f320a283f0