Merge changes I1234326d,Idffcf784

* changes:
  Temporarily remove netd_stable_secret_prop from compat infra.
  Temporarily revert the SELinux policy for persist.netd.stable_secret.

prebuilts/api/26.0/26.0.ignore.cil

@@ -10,7 +10,6 @@
     hal_tetheroffload_hwservice
     kmsg_debug_device
     memcg_device
-    netd_stable_secret_prop
     sysfs_fs_ext4_features
     timezone_service
     tombstoned_java_trace_socket))

private/property_contexts

@@ -50,7 +50,6 @@ persist.logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
 logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
 persist.log.tag         u:object_r:log_tag_prop:s0
 persist.mmc.            u:object_r:mmc_prop:s0
-persist.netd.stable_secret      u:object_r:netd_stable_secret_prop:s0
 persist.sys.            u:object_r:system_prop:s0
 persist.sys.safemode    u:object_r:safemode_prop:s0
 ro.sys.safemode         u:object_r:safemode_prop:s0

public/netd.te

@@ -62,7 +62,6 @@ allow netd dnsmasq:process signal;
 allow netd clatd:process signal;
 
 set_prop(netd, ctl_mdnsd_prop)
-set_prop(netd, netd_stable_secret_prop)
 
 # Allow netd to publish a binder service and make binder calls.
 binder_use(netd)
@@ -109,11 +108,3 @@ neverallow netd { app_data_file system_data_file }:dir_file_class_set write;
 neverallow { domain -system_server -dumpstate -netd } netd_service:service_manager find;
 neverallow { domain -system_server -dumpstate } netd:binder call;
 neverallow netd { domain -system_server -servicemanager userdebug_or_eng(`-su') }:binder call;
-
-# persist.netd.stable_secret contains RFC 7217 secret key which should never be
-# leaked to other processes. Make sure it never leaks.
-neverallow { domain -netd -init } netd_stable_secret_prop:file r_file_perms;
-
-# We want to ensure that no other process ever tries tampering with persist.netd.stable_secret,
-# the RFC 7217 secret key managed by netd. Doing so could compromise user privacy.
-neverallow { domain -netd -init } netd_stable_secret_prop:property_service set;

public/property.te

@@ -30,7 +30,6 @@ type log_tag_prop, property_type, log_property_type;
 type mmc_prop, property_type;
 type net_dns_prop, property_type;
 type net_radio_prop, property_type, core_property_type;
-type netd_stable_secret_prop, property_type;
 type nfc_prop, property_type, core_property_type;
 type overlay_prop, property_type;
 type pan_result_prop, property_type, core_property_type;