Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am: 53738ccfb3 am: a5dfff71ad -s ours am: 57b3fe1734 -s ours am: 4e7416fb17 -s ours am: e6f5cc3a86 -s ours" into tm-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
ce0858a63f