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

Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am: 53738ccf am: a5dfff71 -s ours am: 57b3fe17 -s ours am: 4e7416fb -s ours am: e6f5cc3a -s ours" into tm-qpr-dev-plus-aosp am: ce0858a6 -s ours

am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19449015



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