[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: 54f0522027
-s ours am: 7e67690072
-s ours am: 43ecd848b4
-s ours am: 601afe2f7e
-s ours am: a9888cb51c
-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: I11be5ab17d2fc02559dd39e249e336e2e9b0167e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: