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: I25c6580a508bb90ffd11974c5e145b764d8d6485