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: f55c3136 am: 471fa3a8 am: 8fb88873

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

Change-Id: I8b95dddab1f0091da188191426b4e7199449f258