Merge "system_server: add CAP_SYS_PTRACE"