Merge the 2019-01-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Patch URI vulnerability in contact photo editing

Change-Id: I8ce05ae5ae3003000d6fda4122b0ac2fb455ea81