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

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



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