tree 1caebbf20ea6686545bf87389150c87eda5e77f0
parent 3e7fcf95e997eeccbb78ef3973ff68824e6c4b41
parent c234bbc1c37711aae956e588c3fece07590a9e24
author Anna Bauza <annabauza@google.com> 1724962937 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1724962937 +0000

[automerger skipped] RESTRICT AUTOMERGE fix: Security Report - Reveal images across users via EditUserPhotoController am: d46d20c545 -s ours am: 13dec98086 -s ours am: 2e04c16be9 -s ours am: de2bbfb562 -s ours am: c234bbc1c3 -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>