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

Merge "[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: 141dc637 -s ours am: 40ec6382 -s ours am: bb562d74 -s ours am: 5d23958f -s ours" into tm-d1-dev-plus-aosp am: 19f1f4fb -s ours am: d30d0a60 -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: If29d2ae66444fe2a0bce38d6b58c3830bc197e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>