[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: 212ad259 -s ours am: 65c0e7db -s ours am: 3e7fcf95 -s ours

am skip reason: contains skip directive

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



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