am fbc291cb: am 6500db1a: Merge "Forbid javascript- and file-scheme intents"

* commit 'fbc291cb6534fa9a4d507d4df1b26ec77e1e03bf':
  Forbid javascript- and file-scheme intents