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

Change-Id: I8a0cce81dc4b7b76750ea628ad3c16eed579e7b1