Address photo editing security bug am: 8b19ca4708 am: 8036494cfd am: 9f1e088258 am: 56a4e964f8 am: 8e02440372 am: b21622581f am: d3584da8b2

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

Change-Id: I430d1a1dd35c55379fed92d59dd7a5851af18382