Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8b8 am: 8a0f592d2a am: ad8a4a7fff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694 Change-Id: I8706487934f5ed5c632a885d0576e0248cefeff7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: