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

[automerger skipped] Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944 am: f76ea600 am: 5e2b9a43 -s ours am: 12032fc4 -s ours

am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d is already in history

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



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