[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: 425d0d65 am: 38a745d5 -s ours am: edc47512 -s ours am: a66f8efb -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: Iaaa0e9b65b4a0d8f846d7c0adc75c92c8b206115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>