am f8e7e59b: (-s ours) am b82173f6: Merge "Revert "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser"" into klp-dev

* commit 'f8e7e59b91c721bd5d802e759af06af6f351d4c9':