Merge "Fix b/6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps"
tree: 030fac12c837514412df5d3c9b48a9891fa61bc6
  1. res/
  2. src/