Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
am: c922c4827a

Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b