Merge "Android WebView: Deprecate unsafe file urls APIs" into rvc-dev am: 8ed01d4075

Change-Id: I747a794094dd4d72dd9a30c61984903c091aa010