[automerger] Patch URI vulnerability in contact photo editing am: ccfd94b965

Change-Id: Idb0fb5f8deb5632a5aa52cd7bee48a349dcca09d