Merge "Make per-application memcg hierarchy configurable via a property"
am: 54be246a1f

Change-Id: I6f3e2ccc56e65c74cac259a1522bdc900725c500