resolved conflicts for merge of 0406189c to lmp-dev-plus-aosp

Change-Id: Ic7d1d55cfb7e2391eef1b6ad216b74b723c53f96

adbd.te

@@ -69,6 +69,8 @@ allow adbd appdomain:unix_stream_socket connectto;
 allow adbd zygote_exec:file r_file_perms;
 allow adbd system_file:file r_file_perms;
 
+allow adbd kernel:security read_policy;
+
 service_manager_local_audit_domain(adbd)
 auditallow adbd {
     service_manager_type

app.te

@@ -162,8 +162,6 @@ allow appdomain runas_exec:file getattr;
 # Check SELinux policy and contexts.
 selinux_check_access(appdomain)
 selinux_check_context(appdomain)
-# Enable reading of current selinux policy file
-allow appdomain kernel:security read_policy;
 # Validate that each process is running in the correct security context.
 allow appdomain domain:process getattr;