Do not merge.

Cherry pick:

Remove content:// from the Browser.

Disable content access in WebView as well.  This requires a change to
frameworks/base.

Bug: 1196879
Change-Id: I00ca884654cbf53128f1e97389d2d8d44598e1c1
3 files changed