[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: 13dec980 -s ours am: 2e04c16b -s ours am: de2bbfb5 -s ours am: c234bbc1 -s ours

am skip reason: contains skip directive

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



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