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

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

Change-Id: I170597eb86c5513e2839c823b1469fed228c080e