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

Change-Id: I205dc8f8e3a09f3934c0898d891f3baace4c1865