[automerger skipped] Prevent exfiltration of system files via avatar picker....

[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d am: 05ea36dd am: ff5b6611 am: cbf1699c -s ours am: 52f5f2ee -s ours am: 54f05220 -s ours

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

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



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