[automerged blank] Prevent exfiltration of system files via avatar picker. 2p: 1b48ca6b7f 2p: fd3945a3f4

Blank merge reason: Change-Id Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is in history

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

Bug: 187702830
Change-Id: Id7ec88fe4c57e328bac7d2b9792c0d8484b39f48
Merged-In: Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe