Merge "MediaRoute2ProviderService: Resolve API review"