Merge "Prevent exfiltration of system files via avatar picker." into tm-dev...

Merge "Prevent exfiltration of system files via avatar picker." into tm-dev am: 5489aa36 am: addd691c am: 46dd72d5 am: b5176fa9

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



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