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

Change-Id: Icd7edc56cd68a4abffaaac6d46816df31cda81de