[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: 0ed41ee4e2 am: 772a55f7df -s ours am: b6f90a87d1 -s ours am: 5004019b77 -s ours am: 39f3f4a768 -s ours am: f4f892be31 -s ours am: 52f1f41846 -s ours am: 26d6919cc2 -s ours am: 4097e3cf9a -s ours

am skip reason: contains skip directive

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

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