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

* security-aosp-qt-release:
  Allow adbd to access /proc/net/{tcp,tcp6,udp,udp6}

Change-Id: I41f44356e1911938445c6fd85d3e18e413c7c920