Merge branch 'security-aosp-rvc-release' into int/11/fp3

* security-aosp-rvc-release:
  Prevent exfiltration of system files via user image settings.

Change-Id: I5bfa38afd97906483d8d50127e11dfec2ea9a46f