Merge "Address photo editing security bug am: 8b19ca4708 am: 8036494cfd am: 9f1e088258 am: 56a4e964f8 am: 8e02440372 am: b21622581f am: d3584da8b2 am: a47a2f4a0a" into sc-v2-dev-plus-aosp