[automerger] Patch URI vulnerability in contact photo editing am: ccfd94b965 am: 2fc4d78bfc am: fc6e94648d am: 3ffe76ed9c am: 456f745849
am: 9df22bbe22

Change-Id: I0dfe257eee28bb2c115879d7fe6d1aae098bdd94