Merge "Increase size of BatteryStatsService stats buffer" into qt-r1-dev
am: dc9988b6e2

Change-Id: I09ea0605e66d9e732ab133f77493b3d0015c1896