Merge "Revert "Prevent exfiltration of system files via avatar picker."" into...

Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8 am: 8a0f592d am: df6c4b7a am: c97e893c

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



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