Merge "MediaRoute2Provider: Revisit session related APIs"