[automerger skipped] Merge "fix: Security Report - Reveal images across users...

[automerger skipped] Merge "fix: Security Report - Reveal images across users via EditUserPhotoController" into udc-mainline-prod am: 9e4c3378 -s ours

am skip reason: skipped by annabauza

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28598523



Change-Id: I2a4b536a727e5d6364ccca4a0b04de41020e895b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>