Merge "Fix NPE in MediaRoute2ProviderServiceProxy#notifyProviderUpdated" into main