Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  Prevent exfiltration of system files via avatar picker.
  Revert "Prevent exfiltration of system files via user image settings."

Change-Id: Icf83defc055ceadf2bcaa92ec551abf39e25b92a