Merge "Rename variables and remove unused from SystemMediaRoute2Provider"