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

[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: d46d20c5 -s ours

am skip reason: contains skip directive

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



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