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