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

Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d am: 05031cc5 am: 03b1a529

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



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