[conflict] Merge "Prevent exfiltration of system files via user image...

[conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff1649 am: e6e739d8

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



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