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

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



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