Merge "Fix MediaRoute2ProviderService TODOs" into rvc-dev