[automerger skipped] [automerged blank] Prevent exfiltration of system files...

[automerger skipped] [automerged blank] Prevent exfiltration of system files via avatar picker. 2p: 1b48ca6b 2p: fd3945a3 am: 0187e7f5 -s ours am: 524499af -s ours am: c03ff642 -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: Ic1bec1071ba98bb1cbe30fbca20b90f1d90dbcaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>