[automerger skipped] Merge "Fix: read memory.stat from per-app cgroup only if...

[automerger skipped] Merge "Fix: read memory.stat from per-app cgroup only if per-app memcg are enabled on a device" into pi-dev am: 37a944e8
am: fad620e9  -s ours

Change-Id: Ib5bc2c8aa9d883cc906b245152288678fc3d8618