resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp

Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0
diff --git a/logcat/logcatd.rc b/logcat/logcatd.rc
index 0bc581e..173d391 100644
--- a/logcat/logcatd.rc
+++ b/logcat/logcatd.rc
@@ -11,3 +11,4 @@
     # logd for write to /data/misc/logd, log group for read from log daemon
     user logd
     group log
+    writepid /dev/cpuset/system-background/tasks