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