Merge "Correct annotations for WebViewUpdateService/Manager." into main