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

Change-Id: Iabdb402d2bddffbb1bc601bd2191a20dce1f1c72