Address photo editing security bug am: 8b19ca47 am: 8036494c am:...

Address photo editing security bug am: 8b19ca47 am: 8036494c am: 9f1e0882 am: 56a4e964 am: 8e024403 am: b2162258 am: d3584da8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/15840259

Change-Id: I430d1a1dd35c55379fed92d59dd7a5851af18382