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

Merge "Address photo editing security bug am: 8b19ca47 am: 8036494c am: 9f1e0882 am: 56a4e964 am: 8e024403 am: b2162258 am: d3584da8 am: a47a2f4a" into sc-v2-dev-plus-aosp am: c60ce15e

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

Change-Id: I714a7d9c94b19e8edb7452b84db2c425d5f30940