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: 33a08e90

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



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