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: Ia162a127f2db67ea4aea8ae50ffa56cd24ec14d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>