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

Change-Id: I1ccd77636a3383be1bd46cef2c998872250fb6e3