[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: 13f54aba -s ours am: bc400d71 -s ours am: d2716f00 -s ours am: 2f9a66c8 -s ours am: 3258f8c8 -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: I7a094bd9a3a6bdf249c0649b9473584f60361aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>