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

* dev/11/fp3/security-aosp-rvc-release:
  Prevent exfiltration of system files via avatar picker.
  Revert "Prevent exfiltration of system files via user image settings."

Change-Id: I743aff5929f3a491a2090862f6c581952375e824