Bug:10652036
Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64
This is a cherry-pick of a5c86c644b
to prevent a automerger failure.
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/webkit/WebViewClassic.java
core/java/android/webkit/WebViewProvider.java