Continuation of 9b2e0cbe am: df642bef am: 33111652

am: f316f32f

Change-Id: I15467753f23961dd86fad1d22db8669c0d0a275f

private/system_server.te

@@ -789,8 +789,7 @@ neverallow system_server { domain -system_server }:process ptrace;
 
 # CAP_SYS_RESOURCE was traditionally needed for sensitive /proc/PID
 # file read access. However, that is now unnecessary (b/34951864)
-# This neverallow can be removed after b/34951864 is fixed.
-neverallow system_server system_server:capability sys_resource;
+neverallow system_server system_server:global_capability_class_set sys_resource;
 
 # TODO(b/67468181): Remove following lines upon resolution of this bug
 dontaudit system_server statscompanion_service:service_manager { add find };