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

Change-Id: Ibb574c2d32c34e900287de2173a0212aa20ed715