[automerger skipped] Merge "Add system_server to system group only if per_app_memcg is true" am: afa1c743be  -s ours
am: 4490da5346  -s ours

Change-Id: I9694b0107f81e5db792458ea27e43b45dcab9611