Merge "Refactor WebViewTest#setNetworkAvailable" into jb-mr2-dev