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

Change-Id: I8c01b72d5f593070eebbac1f5271ca166e6abf7b