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: cf4f22e8 am: 41bd2e1e

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



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