[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: a57c898661 -s ours am: 148e11a485 -s ours am: 212ad25931 -s ours am: 65c0e7db9f -s ours am: 5de29a9d19 -s ours

am skip reason: contains skip directive

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

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