Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Messaging ignores file URIs shared via intent

Change-Id: I266c3acd1e732e15ca48c3a203b116439581d52a