Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944

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



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