Merge "Unhide MediaSessionManager APIs"