am bcdae81a: am 7a64e976: Merge "MediaSessionManager: make the binder implementation static" into mnc-dev

* commit 'bcdae81a7418ba1f19c0c3fb8f65dcb29cf17da9':
  MediaSessionManager: make the binder implementation static