Merge cherrypicks of [17630426] into security-aosp-qt-release.

Change-Id: I5dc8e162c4a586635b6f6d4e0302450caf6e21be
diff --git a/prebuilts/api/29.0/private/net.te b/prebuilts/api/29.0/private/net.te
new file mode 100644
index 0000000..d42f097
--- /dev/null
+++ b/prebuilts/api/29.0/private/net.te
@@ -0,0 +1,2 @@
+# b/227803340
+allow netdomain self:netlink_route_socket bind;
diff --git a/prebuilts/api/29.0/public/net.te b/prebuilts/api/29.0/public/net.te
index afa2a9c..65562b8 100644
--- a/prebuilts/api/29.0/public/net.te
+++ b/prebuilts/api/29.0/public/net.te
@@ -18,7 +18,7 @@
 allow {netdomain -ephemeral_app} port_type:udp_socket name_bind;
 allow {netdomain -ephemeral_app} port_type:tcp_socket name_bind;
 # See changes to the routing table.
-allow netdomain self:netlink_route_socket { create read getattr write setattr lock append bind connect getopt setopt shutdown nlmsg_read };
+allow netdomain self:netlink_route_socket { create read getattr write setattr lock append connect getopt setopt shutdown nlmsg_read };
 
 # Talks to netd via dnsproxyd socket.
 unix_socket_connect(netdomain, dnsproxyd, netd)
diff --git a/private/net.te b/private/net.te
new file mode 100644
index 0000000..d42f097
--- /dev/null
+++ b/private/net.te
@@ -0,0 +1,2 @@
+# b/227803340
+allow netdomain self:netlink_route_socket bind;
diff --git a/public/net.te b/public/net.te
index afa2a9c..65562b8 100644
--- a/public/net.te
+++ b/public/net.te
@@ -18,7 +18,7 @@
 allow {netdomain -ephemeral_app} port_type:udp_socket name_bind;
 allow {netdomain -ephemeral_app} port_type:tcp_socket name_bind;
 # See changes to the routing table.
-allow netdomain self:netlink_route_socket { create read getattr write setattr lock append bind connect getopt setopt shutdown nlmsg_read };
+allow netdomain self:netlink_route_socket { create read getattr write setattr lock append connect getopt setopt shutdown nlmsg_read };
 
 # Talks to netd via dnsproxyd socket.
 unix_socket_connect(netdomain, dnsproxyd, netd)