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

Change-Id: I9354fdb6af09c3468d2d97e31472f23bdcaf5a4a