Merge "Revert "Prevent exfiltration of system files via user image settings.""...

Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am: 53738ccf

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



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