Merge "wificond_service: drop system_service typeattribute" am: ccf9fd7e am:...

Merge "wificond_service: drop system_service typeattribute" am: ccf9fd7e am: e9f62e21 am: b5269e8b
am: 7ea0ca66

Change-Id: I8fe8fcfe8fcda00fde33dcb747e7fca9e2e19949

public/service.te

@@ -133,7 +133,7 @@ type webviewupdate_service, app_api_service, system_server_service, service_mana
 type wifip2p_service, app_api_service, system_server_service, service_manager_type;
 type wifiscanner_service, system_api_service, system_server_service, service_manager_type;
 type wifi_service, app_api_service, system_server_service, service_manager_type;
-type wificond_service, system_server_service, service_manager_type;
+type wificond_service, service_manager_type;
 type wifiaware_service, app_api_service, system_server_service, service_manager_type;
 type window_service, system_api_service, system_server_service, service_manager_type;
 type wpa_supplicant_service, system_server_service, service_manager_type;

public/system_server.te

@@ -499,6 +499,7 @@ allow system_server nfc_service:service_manager find;
 allow system_server radio_service:service_manager find;
 allow system_server system_server_service:service_manager { add find };
 allow system_server surfaceflinger_service:service_manager find;
+allow system_server wificond_service:service_manager find;
 
 allow system_server keystore:keystore_key {
 	get_state