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: 64b5a7f4 am: 3e61fcc4 am: 519dc6ec am: 31f14ef6" into sc-v2-dev-plus-aosp am: 94b85783

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

Change-Id: I79029d3105463001ad3d960147e07d1ea5d28fa1