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

[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d am: 05031cc5 am: 03b1a529 am: e2815b7e -s ours am: 48046cf4 -s ours am: 819430ed -s ours am: d3938dfc -s ours am: da927d5a -s ours am: 9190be82 -s ours am: d8879d97 -s ours

am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd4 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016



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