RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: 0ed41ee4

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



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