[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images...

[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: 0ed41ee4 am: 772a55f7 -s ours am: b6f90a87 -s ours am: 5004019b -s ours am: e589bda1 -s ours

am skip reason: contains skip directive

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



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