resolve merge conflicts of 09f01c5f to master.

Change-Id: Ia6fa29637a3679836c61800d6a1cbe2917e8c43e

app.te

@@ -207,6 +207,8 @@ allow appdomain console_device:chr_file { read write };
 # only allow unprivileged socket ioctl commands
 allowxperm { appdomain -bluetooth } self:{ rawip_socket tcp_socket udp_socket } ioctl unpriv_sock_ioctls;
 
+allow { appdomain -isolated_app } ion_device:chr_file rw_file_perms;
+
 ###
 ### CTS-specific rules
 ###

domain.te

@@ -23,6 +23,7 @@ allow domain self:process {
 };
 allow domain self:fd use;
 allow domain proc:dir search;
+allow domain proc_net:dir search;
 allow domain self:dir r_dir_perms;
 allow domain self:lnk_file r_file_perms;
 allow domain self:{ fifo_file file } rw_file_perms;