[automerger skipped] Merge "Make per-application memcg hierarchy configurable via a property" am: 54be246a1f
am: d23ead4363  -s ours

Change-Id: I2a3646920b70b355ac0a5ae6d57d3d95d8bf2227