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

Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0
diff --git a/lmkd/lmkd.rc b/lmkd/lmkd.rc
index 83c5ff0..7d6cb11 100644
--- a/lmkd/lmkd.rc
+++ b/lmkd/lmkd.rc
@@ -2,3 +2,4 @@
     class core
     critical
     socket lmkd seqpacket 0660 system system
+    writepid /dev/cpuset/system-background/tasks