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

[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: a57c8986 -s ours am: 148e11a4 -s ours am: 6673e7ac -s ours am: cadd7976 -s ours am: bf687e86 -s ours

am skip reason: contains skip directive

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



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