tree 75ac553dd8499f1a2a4731f25258c621aeb64775
parent 141dc63796807be22e8c0c5e67cae474156b7d88
parent 52f5f2ee317e4d8d8d6f69aadc057a3a329282f4
author Oli Lan <olilan@google.com> 1662585896 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662585896 +0000

[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours

am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

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