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

* security-aosp-qt-release:
  Prevent exfiltration of system files via user image settings.
  Hide private DNS settings UI in Guest mode

Change-Id: I84007bd6c3fbb8da54e4a3a706b2adbbfc047592