Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev
am: fb11e4c9b1

Change-Id: Icc9d0bb40515a87ddb0c8c0b28d0715a3f6bb0fe