[automerger skipped] Merge "Revert "Prevent exfiltration of system files via...

[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am: 53738ccf am: a5dfff71 -s ours am: 57b3fe17 -s ours am: 4e7416fb -s ours

am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d is already in history. Merged-In was found from reverted change.

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



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