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

Address photo editing security bug am: 8b19ca47 am: 8036494c am: 9f1e0882 am: 56a4e964 am: 64b5a7f4 am: 3e61fcc4 am: 519dc6ec am: 0ae2faa2 am: fa203e71

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

Change-Id: I23354a83a75a4223f99a4d0db035b90cd772a438