[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: a57c898661 -s ours am: 148e11a485 -s ours am: 6673e7ac18 -s ours am: cadd7976e9 -s ours

am skip reason: contains skip directive

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

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