Merge "MediaSessionManager: make the binder implementation static" into mnc-dev