Merge "Simplify WebViewProviderInfo - move its logic into WebViewUpdateService." into nyc-dev