Merge "Clean up android.webkit.update_service_v2." into main