Merge "Address photo editing security bug am: 8b19ca4708 am: 8036494cfd am: 9f1e088258 am: 56a4e964f8 am: 64b5a7f4d5 am: 3e61fcc45d am: 519dc6ec8c am: 31f14ef6fa" into sc-v2-dev-plus-aosp