[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 am: ed29b05d

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



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