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

Change-Id: I38a0994d88f5cb38057e9eb17bbc786b03843b23