Merge "Enabled aggregated per-uid stats collection by default" into pi-dev am: 981d61ddf8
am: adb9a96b8e

Change-Id: I76eb5d2c94af5138232142ef603f7da6c088b2fa