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: 11b8a6fb -s ours" into tm-d1-dev-plus-aosp